Merge remote-tracking branch 'origin/master'

laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java

@@ -55,7 +55,7 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
     private Map<String, Object> setVariables(ProcessEsInitChange initChange) {
         Map<String, Object> map = new HashMap<>();
         // 设置流程中各个节点的人
-        map.put("draftUser", UserUtils.getUserIdByUserName(initChange.getCreateBy()));
+        map.put("createUser", UserUtils.getUserIdByUserName(initChange.getCreateBy()));
         map.put("contactUser", initChange.getContactUser());
         map.put("standardExpertList", Optional.ofNullable(initChange.getStandardExpert()).map(s -> Arrays.asList(s.split(","))).orElse(Collections.emptyList()));
         map.put("mainDraftUserLeader", initChange.getMainDraftUserLeader());

laws-modules/src/main/java/com/jero/modules/sys/utils/UserUtils.java

@@ -20,6 +20,6 @@ public class UserUtils {
 
     public static String getUserIdByUserName(String createBy) {
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        return sysUser.getUsername();
+        return sysUser.getId();
     }
 }