update - 调整"黑白名单"更新模型入参

workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/manage/ProcessCategoryApi.java

@@ -108,7 +108,7 @@ public interface ProcessCategoryApi {
      * @return
      */
     @PostMapping("/api/process/category/config/create")
-    CommonResponse<CategoryConfigItemVO> createConfig(@RequestBody CategoryConfigCreateDTO dto);
+    CommonResponse<Boolean> createConfig(@RequestBody CategoryConfigCreateDTO dto);
 
     /**
      * 删除指定分类的配置项数据

workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/BpmnFlowNodeMode.java

@@ -8,6 +8,7 @@ public enum BpmnFlowNodeMode {
     AUTO_PASSED("AUTO_PASSED", "自动通过"),
     AUTO_REJECTED("AUTO_REJECTED", "自动拒绝"),
     BUSINESS_BIZ_SPECIFY("BUSINESS_BIZ_SPECIFY", "业务指定审批人"),
+    NO_BODY("NO_BODY", "不设置审批人"),
     EXCEPTIONAL("EXCEPTIONAL", "异常"),
     ;
 

workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/category/CategoryConfigCreateDTO.java

@@ -4,6 +4,9 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
 /**
  * 业务分类黑白名单创建入参模型
  *
@@ -30,7 +33,8 @@ public class CategoryConfigCreateDTO {
      * 工作台 ID
      */
     @ApiModelProperty("工作台 ID")
-    private Long workspaceId;
+    @NotEmpty(message = "工作台 ID 不能为空")
+    private List<Long> workspaceIds;
 
     /**
      * 操作人姓名

workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/CategoryConfigService.java

@@ -16,9 +16,8 @@ public interface CategoryConfigService {
      * 业务分类创建黑白名单配置项
      *
      * @param dto
-     * @return
      */
-    CategoryConfigItemVO create(CategoryConfigCreateDTO dto);
+    void create(CategoryConfigCreateDTO dto);
 
     /**
      * 业务分类黑白名单配置项搜索

workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessInstanceServiceImpl.java

@@ -81,6 +81,7 @@ import static cn.axzo.workflow.common.enums.BpmnFlowNodeMode.AUTO_REJECTED;
 import static cn.axzo.workflow.common.enums.BpmnFlowNodeMode.BUSINESS_BIZ_SPECIFY;
 import static cn.axzo.workflow.common.enums.BpmnFlowNodeMode.EXCEPTIONAL;
 import static cn.axzo.workflow.common.enums.BpmnFlowNodeMode.GENERAL;
+import static cn.axzo.workflow.common.enums.BpmnFlowNodeMode.NO_BODY;
 import static cn.axzo.workflow.common.enums.BpmnFlowNodeMode.OR;
 import static cn.axzo.workflow.common.enums.BpmnFlowNodeType.NODE_BUSINESS;
 import static cn.axzo.workflow.common.enums.BpmnFlowNodeType.NODE_CARBON_COPY;
@@ -588,7 +589,7 @@ public class BpmnProcessInstanceServiceImpl implements BpmnProcessInstanceServic
                                     node.setNodeMode(BUSINESS_BIZ_SPECIFY);
                                     break;
                                 case nobody:
-                                    node.setNodeMode(GENERAL);
+                                    node.setNodeMode(NO_BODY);
                                     break;
                                 default:
                                     if (userTask.getBehavior() instanceof MultiInstanceActivityBehavior) {

workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessTaskServiceImpl.java

@@ -376,8 +376,8 @@ public class BpmnProcessTaskServiceImpl implements BpmnProcessTaskService {
                     (BpmnTaskDelegateAssigner) assginerSnapshot.getValue() : null;
             if (StringUtils.hasLength(vo.getAssignee()) && !vo.getAssignee().contains(TASK_ASSIGNEE_SKIP_FLAT)) {
                 vo.setAssignee(Objects.isNull(assigner) ? "" : assigner.getAssignee());
+                vo.setAssigneeSnapshot(assigner);
             }
-            vo.setAssigneeSnapshot(assigner);
         }
         return vos;
     }

workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/CategoryConfigServiceImpl.java

@@ -37,13 +37,15 @@ public class CategoryConfigServiceImpl extends ServiceImpl<ExtAxDictConfMapper,
     private final CategoryConfigConverter categoryConfigConverter;
 
     @Override
-    public CategoryConfigItemVO create(CategoryConfigCreateDTO dto) {
+    public void create(CategoryConfigCreateDTO dto) {
-        ExtAxDictConf config = new ExtAxDictConf();
+        dto.getWorkspaceIds().forEach(workspaceId -> {
-        config.setDictId(dto.getDictId());
+            ExtAxDictConf config = new ExtAxDictConf();
-        config.setConfigType(dto.getConfigType());
+            config.setDictId(dto.getDictId());
-        config.setWorkspaceId(dto.getWorkspaceId());
+            config.setConfigType(dto.getConfigType());
-        config.setOperationName(dto.getOperationName());
+            config.setWorkspaceId(workspaceId);
-        dictConfMapper.insert(config);
+            config.setOperationName(dto.getOperationName());
+            dictConfMapper.insert(config);
+        });
         return categoryConfigConverter.toVo(config);
     }
 

workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/manage/ProcessCategoryController.java

@@ -141,8 +141,9 @@ public class ProcessCategoryController implements ProcessCategoryApi {
 
     @PostMapping("/config/create")
     @Override
-    public CommonResponse<CategoryConfigItemVO> createConfig(CategoryConfigCreateDTO dto) {
+    public CommonResponse<Boolean> createConfig(CategoryConfigCreateDTO dto) {
-        return success(categoryConfigService.create(dto));
+        categoryConfigService.create(dto);
+        return success(true);
     }
 
     @DeleteMapping("/config/delete/{id}")