审批2.0增加审批角色

platform-service/src/main/java/com/platform/service/workflow/impl/WorkflowServiceImpl.java

@@ -130,9 +130,36 @@ public class WorkflowServiceImpl extends BaseServiceImpl<WorkflowMapper, Workflo
                     node.setSwitchJson(condition.toJSONString());
                     node.setSwitchHandleId(jsonObject.getString("handleNameId"));
                     break;
-                case CommonConstants.VERIFY_USER_TYPE: // 审核人
-                    node.setUserId(jsonObject.getString("verifier"));
-                    node.setUserName(jsonObject.getString("userName"));
+                case CommonConstants.VERIFY_USER_TYPE: // 审核人&审核角色
+                    Integer verifyType = jsonObject.getInteger("verifyType");
+                    if(verifyType == null){
+                        throw new DeniedException("人员类型-verifyType不能为空");
+                    }
+                    if(verifyType == CommonConstants.VERIFY_TYPE_USER){
+                        String verifier = jsonObject.getString("verifier");
+                        String userName = jsonObject.getString("userName");
+                        if(StringUtils.isBlank(verifier)){
+                            throw new DeniedException("审批人ID-verifier不能为空");
+                        }
+                        if(StringUtils.isBlank(userName)){
+                            throw new DeniedException("审批人名称-userName不能为空");
+                        }
+                        node.setUserId(verifier);
+                        node.setUserName(userName);
+                    }else{
+                        Integer filterModel = jsonObject.getInteger("nodeFilterModel");
+                        if(filterModel == null){
+                            throw new DeniedException("审批模式-nodeFilterModel不能为空");
+                        }
+                        String roleId = jsonObject.getString("roleId");
+                        String deptId = jsonObject.getString("deptId");
+                        if(StringUtils.isBlank(roleId)){
+                            throw new DeniedException("角色ID-roleId不能为空");
+                        }
+                        if(StringUtils.isBlank(deptId)){
+                            throw new DeniedException("角色所属部门ID-deptId不能为空");
+                        }
+                    }
                     break;
             }
             nodeList.add(node);