代码调整

know_sub_business/src/main/java/com/supervision/knowsub/service/impl/FlowRuleManageServiceImpl.java

@@ -40,6 +40,7 @@ public class FlowRuleManageServiceImpl implements FlowRuleManageService {
             flowRule.setFlowId(flowId);
             flowRule.setRuleName(nodeInfo.getNodeName());
             flowRule.setRuleOrder(i++);
+            flowRule.setRoleId(nodeInfo.getRoleId());
             systemFlowRuleService.save(flowRule);
 
             systemFlowRuleUserService.saveBatch(nodeInfo.getUserIdList().stream().map(userId -> {
@@ -167,7 +168,8 @@ public class FlowRuleManageServiceImpl implements FlowRuleManageService {
         }
         List<NodeInfo> nodeInfoList = flowRuleList.stream().map(flowRule -> NodeInfo.builder()
                 .NodeName(flowRule.getRuleName()).id(flowRule.getId())
-                .order(flowRule.getRuleOrder()).build()).collect(Collectors.toList());
+                .order(flowRule.getRuleOrder()).roleId(flowRule.getRoleId()).build())
+                .collect(Collectors.toList());
 
         List<SystemFlowRuleUser> ruleUserList = systemFlowRuleUserService.lambdaQuery().in(SystemFlowRuleUser::getFlowId, flowId).list();
         Map<String, List<SystemFlowRuleUser>> ruleUserGroupByRuleId = ruleUserList.stream().collect(Collectors.groupingBy(SystemFlowRuleUser::getRuleId));

know_sub_business/src/main/java/com/supervision/knowsub/service/impl/UserManageServiceImpl.java

@@ -48,8 +48,6 @@ public class UserManageServiceImpl implements UserManageService {
 
     private final UserRoleRelationManageService userRoleRelationManageService;
 
-    private final SystemRoleService systemRoleService;
-
     private final SystemDeptService systemDeptService;
 
     @Override
@@ -135,6 +133,7 @@ public class UserManageServiceImpl implements UserManageService {
                 .set(SystemUser::getUsername, userInfoReqVo.getUsername())
                 .set(SystemUser::getDeptId, userInfoReqVo.getDeptId())
                 .set(SystemUser::getRemark, userInfoReqVo.getRemark())
+                .set(SystemUser::getHeadPicId, userInfoReqVo.getHeadPicId())
                 .eq(SystemUser::getId, userInfoReqVo.getId())
                 .update();
 

know_sub_model/src/main/java/com/supervision/knowsub/dto/flow/SystemFlowRuleDTO.java

@@ -18,6 +18,8 @@ public class SystemFlowRuleDTO {
 
     private Integer ruleOrder;
 
+    private String roleId;
+
     private List<SystemFlowRuleUser> userList;
 
     public SystemFlowRuleDTO() {
@@ -29,6 +31,7 @@ public class SystemFlowRuleDTO {
         systemFlowRule.setFlowId(flowId);
         systemFlowRule.setRuleName(ruleName);
         systemFlowRule.setRuleOrder(ruleOrder);
+        systemFlowRule.setRoleId(roleId);
         return systemFlowRule;
     }
 
@@ -42,6 +45,7 @@ public class SystemFlowRuleDTO {
         systemFlowRuleDTO.setRuleName(nodeInfo.getNodeName());
         systemFlowRuleDTO.setFlowId(flowId);
         systemFlowRuleDTO.setRuleOrder(nodeInfo.getOrder());
+        systemFlowRuleDTO.setRoleId(nodeInfo.getRoleId());
         List<SystemFlowRuleUser> ruleUserList = nodeInfo.getUserIdList().stream().map(userId -> {
             SystemFlowRuleUser flowRuleUser = new SystemFlowRuleUser();
             flowRuleUser.setFlowId(flowId);

know_sub_model/src/main/java/com/supervision/knowsub/dto/user/UserInfoDTO.java

@@ -13,6 +13,9 @@ public class UserInfoDTO {
     @Schema(description = "用户id")
     private String id;
 
+    @Schema(description = "头像id")
+    private String headPicId;
+
     @Schema(description = "用户账户")
     private String account;
 

know_sub_model/src/main/java/com/supervision/knowsub/model/SystemFlowRule.java

@@ -34,6 +34,11 @@ public class SystemFlowRule implements Serializable {
      */
     private Integer ruleOrder;
 
+    /**
+     * 节点操作人角色id
+     */
+    private String roleId;
+
     /**
      * 创建人ID
      */

know_sub_model/src/main/java/com/supervision/knowsub/vo/flow/NodeInfo.java

@@ -23,6 +23,9 @@ public class NodeInfo {
     @Schema(description = "节点顺序")
     private Integer order;
 
+    @Schema(description = "节点角色id")
+    private String roleId;
+
     @Tolerate
     public NodeInfo() {
     }

know_sub_model/src/main/resources/mapper/SystemFlowRuleMapper.xml

@@ -9,6 +9,7 @@
             <result property="flowId" column="flow_id" jdbcType="VARCHAR"/>
             <result property="ruleName" column="rule_name" jdbcType="VARCHAR"/>
             <result property="ruleOrder" column="rule_order" jdbcType="INTEGER"/>
+            <result property="roleId" column="role_id" jdbcType="VARCHAR"/>
             <result property="createUserId" column="create_user_id" jdbcType="VARCHAR"/>
             <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
             <result property="updateUserId" column="update_user_id" jdbcType="VARCHAR"/>
@@ -17,7 +18,7 @@
 
     <sql id="Base_Column_List">
         id,flow_id,rule_name,
-        rule_order,create_user_id,create_time,
+        rule_order,role_id,create_user_id,create_time,
         update_user_id,update_time
     </sql>
     <select id="queryUserIsConfigProcess" resultType="java.lang.Integer">