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

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeRegistrationNameServiceImpl.java

@@ -110,8 +110,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
 
     @Transactional(rollbackFor = Exception.class)
     public void save2(String submitType, JSONObject requestParam) {
-        Map<String, JSONObject> jgRegistrationInfoMap = requestParam.entrySet().stream().
-                collect(Collectors.toMap(Map.Entry::getKey, entry -> (JSONObject) entry.getValue()));
+        Map<String, JSONObject> jgRegistrationInfoMap = (Map<String, JSONObject>)JSONObject.parseObject(JSONObject.toJSONString(requestParam),Map.class);
         this.save(submitType, jgRegistrationInfoMap);
     }
 
@@ -194,6 +193,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
     }
 
     private void createTaskModel(JgChangeRegistrationName dto, String taskName, String submitType) {
+        ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         if ("1".equals(submitType)) {
             TaskModelDto taskModelDto = new TaskModelDto();
             taskModelDto.setFlowCreateDate(dto.getApplyDate());
@@ -208,7 +208,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
             taskModelDto.setTaskStatus(this.getTaskCodeByName(dto.getAuditStatus()));
             taskModelDto.setTaskStatusLabel(dto.getAuditStatus());
             taskModelDto.setStartUserId(dto.getCreateUserId());
-            taskModelDto.setStartUser(dto.getCreateUserName());
+            taskModelDto.setStartUser(reginParams.getUserModel().getRealName());
             taskModelDto.setStartUserCompanyName(dto.getUseUnitName());
             taskModelDto.setNextExecuteUser(dto.getNextExecutorIds());
             taskModelDto.setStartDate(dto.getCreateDate());