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/JgChangeRegistrationReformServiceImpl.java

@@ -187,7 +187,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         jgChangeRegistrationReform.setCreateUserName(reginParams.getUserModel().getRealName());
         jgChangeRegistrationReform.setCreateUserCompanyName(reginParams.getCompany().getCompanyName());
         jgRegistrationHistory.setStatus("new");
-        if (map.containsKey("type") && "edit".equals(String.valueOf(map.get("type")))) {
+        if (map.containsKey("type") && "edit".equals(String.valueOf(map.get("type")))&&ObjectUtils.isEmpty(map.get("onlySave"))) {
             jgChangeRegistrationReform.setSequenceNbr(Long.valueOf(String.valueOf(map.get("sequenceNbr"))));
             this.getBaseMapper().updateById(jgChangeRegistrationReform);
             jgChangeRegistrationReform = this.getBaseMapper().selectById(jgChangeRegistrationReform.getSequenceNbr());
@@ -219,7 +219,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
 
         }
 
-        if (!ObjectUtils.isEmpty(map.get("submit"))) {
+        if (!ObjectUtils.isEmpty(map.get("submit"))&&ObjectUtils.isEmpty(map.get("onlySave"))) {
             String instanceId = "";
             if (!ObjectUtils.isEmpty(jgChangeRegistrationReform.getSequenceNbr()) && !ObjectUtils.isEmpty(jgChangeRegistrationReform.getInstanceId())) {
                 // 如果是旧流程则执行一步

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/JgTransferNoticeServiceImpl.java

@@ -435,7 +435,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             BeanUtils.copyProperties(obj, taskMessageDto);
             dto.setModel(taskMessageDto);
             //摘要 按原有规则组装
-            dto.setTaskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", obj.getEquList(), obj.getSupervisoryCode(), obj.getApplyNo()));
+            dto.setTaskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", obj.getEquList(), StringUtils.isEmpty(obj.getSupervisoryCode()) ? "" : obj.getSupervisoryCode(), obj.getApplyNo()));
             //申请单号
             dto.setTaskCode(obj.getApplyNo());
             //业务类型枚举code值
@@ -511,7 +511,8 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             taskModelDto.setStartUserCompanyName(item.getCreateUserCompanyName()); // 任务发起人所在单位
             taskModelDto.setStartDate(item.getCreateDate());
             taskModelDto.setNextExecuteUser(item.getNextExecuteIds());
-            taskModelDto.setTaskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), item.getSupervisoryCode(), item.getApplyNo()));
+
+            taskModelDto.setTaskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), StringUtils.isEmpty(item.getSupervisoryCode()) ? "" : item.getSupervisoryCode(), item.getApplyNo()));
             TaskMessageDto taskMessageDto = new TaskMessageDto();
             BeanUtils.copyProperties(item, taskMessageDto);
             taskModelDto.setModel(taskMessageDto);

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/JgUseRegistrationServiceImpl.java

@@ -209,7 +209,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             // 删除暂存代办
             commonServiceImpl.deleteTaskModel(String.valueOf(jgUseRegistration.getSequenceNbr()));
             String instanceId = "";
-            if (map.containsKey("instanceId")) {
+            if (!ObjectUtils.isEmpty(map.get("instanceId"))) {
                 instanceId = map.get("instanceId").toString();
             } else {
                 // 启动并执行流程