CY
/
mcwl-ai
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

master
Diyu0904 2025-02-07 15:27:29 +08:00
parent 7b99089c67
commit 25efe0d49a
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mcwl-admin/src/main/java/com/mcwl/web/controller/resource/WorkFlowController.java
View File

@ -12,10 +12,10 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import javax.validation.Valid;
import java.util.List; import java.util.List;
@ -115,7 +115,7 @@ public class WorkFlowController extends BaseController {
*/ */
@ApiOperation(value = "添加工作流") @ApiOperation(value = "添加工作流")
@PostMapping("/addWorkFlow") @PostMapping("/addWorkFlow")
public AjaxResult addWorkFlow(@Valid @RequestBody AddRequestWorkFlow addRequestWorkFlow){ public AjaxResult addWorkFlow(@Validated @RequestBody AddRequestWorkFlow addRequestWorkFlow){
return workFlowService.addWorkFlow(addRequestWorkFlow); return workFlowService.addWorkFlow(addRequestWorkFlow);
} }

4
mcwl-resource/src/main/java/com/mcwl/resource/domain/dto/AddRequestWorkFlow.java
View File

@ -8,6 +8,8 @@ import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import javax.validation.Valid; import javax.validation.Valid;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.List; import java.util.List;
/** /**
@ -26,8 +28,10 @@ import java.util.List;
public class AddRequestWorkFlow { public class AddRequestWorkFlow {
@ApiModelProperty(value = "工作流信息") @ApiModelProperty(value = "工作流信息")
@Valid @Valid
@NotNull(message = "工作流信息不能为空")
private AddWorkFlow addWorkFlow; private AddWorkFlow addWorkFlow;
@Valid @Valid
@NotEmpty(message = "工作流版本信息不能为空")
@ApiModelProperty(value = "工作流版本信息") @ApiModelProperty(value = "工作流版本信息")
private List<AddWorkFlowVersion> addWorkFlowVersions; private List<AddWorkFlowVersion> addWorkFlowVersions;

4
mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ToActivityServiceImpl.java
View File

@ -1,8 +1,8 @@
package com.mcwl.resource.service.impl; package com.mcwl.resource.service.impl;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mcwl.resource.domain.ModelProduct;
import com.mcwl.resource.domain.ToActivity; import com.mcwl.resource.domain.ToActivity;
import com.mcwl.resource.mapper.ToActivityMapper; import com.mcwl.resource.mapper.ToActivityMapper;
import com.mcwl.resource.service.ToActivityService; import com.mcwl.resource.service.ToActivityService;
@ -31,7 +31,9 @@ public class ToActivityServiceImpl extends ServiceImpl<ToActivityMapper, ToActiv
@Override @Override
public List<ToActivity> selectToActivityList(ToActivity toActivity) { public List<ToActivity> selectToActivityList(ToActivity toActivity) {
LambdaQueryWrapper<ToActivity> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<ToActivity> queryWrapper = new LambdaQueryWrapper<>();
if (StrUtil.isNotBlank(toActivity.getActivityName())){
queryWrapper.eq(ToActivity::getActivityName, toActivity.getActivityName()); queryWrapper.eq(ToActivity::getActivityName, toActivity.getActivityName());
}
return toActivityMapper.selectList(queryWrapper); return toActivityMapper.selectList(queryWrapper);
} }