diff --git a/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/WorkFlowController.java b/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/WorkFlowController.java
index 9c15d6b..d2d04b4 100644
--- a/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/WorkFlowController.java
+++ b/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/WorkFlowController.java
@@ -12,10 +12,10 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.validation.Valid;
 import java.util.List;
 
 
@@ -115,7 +115,7 @@ public class WorkFlowController extends BaseController {
      */
     @ApiOperation(value = "添加工作流")
     @PostMapping("/addWorkFlow")
-    public AjaxResult addWorkFlow(@Valid @RequestBody AddRequestWorkFlow addRequestWorkFlow){
+    public AjaxResult addWorkFlow(@Validated @RequestBody AddRequestWorkFlow addRequestWorkFlow){
 
         return workFlowService.addWorkFlow(addRequestWorkFlow);
     }
diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/domain/dto/AddRequestWorkFlow.java b/mcwl-resource/src/main/java/com/mcwl/resource/domain/dto/AddRequestWorkFlow.java
index 739f3de..ecd68b3 100644
--- a/mcwl-resource/src/main/java/com/mcwl/resource/domain/dto/AddRequestWorkFlow.java
+++ b/mcwl-resource/src/main/java/com/mcwl/resource/domain/dto/AddRequestWorkFlow.java
@@ -8,6 +8,8 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.validation.Valid;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
@@ -26,8 +28,10 @@ import java.util.List;
 public class AddRequestWorkFlow {
     @ApiModelProperty(value = "工作流信息")
     @Valid
+    @NotNull(message = "工作流信息不能为空")
     private AddWorkFlow addWorkFlow;
     @Valid
+    @NotEmpty(message = "工作流版本信息不能为空")
     @ApiModelProperty(value = "工作流版本信息")
     private List<AddWorkFlowVersion> addWorkFlowVersions;
 
diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ToActivityServiceImpl.java b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ToActivityServiceImpl.java
index fe21434..755009a 100644
--- a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ToActivityServiceImpl.java
+++ b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ToActivityServiceImpl.java
@@ -1,8 +1,8 @@
 package com.mcwl.resource.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.mcwl.resource.domain.ModelProduct;
 import com.mcwl.resource.domain.ToActivity;
 import com.mcwl.resource.mapper.ToActivityMapper;
 import com.mcwl.resource.service.ToActivityService;
@@ -31,7 +31,9 @@ public class ToActivityServiceImpl extends ServiceImpl<ToActivityMapper, ToActiv
     @Override
     public List<ToActivity> selectToActivityList(ToActivity toActivity) {
         LambdaQueryWrapper<ToActivity> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(ToActivity::getActivityName, toActivity.getActivityName());
+        if (StrUtil.isNotBlank(toActivity.getActivityName())){
+            queryWrapper.eq(ToActivity::getActivityName, toActivity.getActivityName());
+        }
         return toActivityMapper.selectList(queryWrapper);
     }