Merge remote-tracking branch 'origin/SecondStage' into SecondStage

laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/common/RevisionTaskNodeIdConstant.java

@@ -14,8 +14,10 @@ public class RevisionTaskNodeIdConstant {
     public static final String ADVICE_COLLECT = "Activity_1riqzkp";
     /** 法规工程师派号 */
     public static final String SET_STANDARD_NUMBER = "Activity_11uuyg0";
-    /** 征求意见人员 */
+    /** 主起草人 */
     public static final String MAIN_DRAFT_USER = "mainDraftUser";
+    /** 法规工程师 */
+    public static final String STANDARD_ENGINEER = "standardEngineer";
     /** 征求意见人员 */
     public static final String ADVICE_USER_LIST = "adviceUserList";
     /** 开启征求意见 */

laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/service/impl/EsRevisionServiceImpl.java

@@ -254,9 +254,11 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
                 if (adviceFlag) {
                     List<String> adviceUserList = Arrays.asList(data.getAdviceUsers().split(","));
                     taskService.setVariable(taskId, ADVICE_USER_LIST, adviceUserList);
+                    taskService.setVariable(taskId, STANDARD_ENGINEER, curUserId);
                     taskService.setVariable(taskId, OPEN, true);
                     // 保存流程数据
                     saveOrUpdate(data);
+                    userMap.put(STANDARD_ENGINEER, curUserId);
                     userMap.put(ADVICE_USER_LIST, data.getAdviceUsers());
                     processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, userMap);
                 } else {