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

@@ -163,7 +163,6 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         jgChangeRegistrationReform.setUseRegistrationCode(jgRegistrationHistory.getUseRegistrationCode());
         jgRegistrationHistory.setStatus("new");
         if (map.containsKey("type") && "edit".equals(String.valueOf(map.get("type")))) {
-            jgChangeRegistrationReform.setUseUnitCreditCode(null);
             jgChangeRegistrationReform.setSequenceNbr(Long.valueOf(String.valueOf(map.get("sequenceNbr"))));
             this.getBaseMapper().updateById(jgChangeRegistrationReform);
             jgRegistrationHistory.setSequenceNbr(jgRegistrationHistoryMapper.getSequenceNbrByEquidAndDocumentId(equipId, String.valueOf(map.get("applyNo"))));
@@ -192,7 +191,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
 
         if (!ObjectUtils.isEmpty(map.get("submit"))) {
             String instanceId = "";
-            if (!ObjectUtils.isEmpty(jgChangeRegistrationReform.getInstanceId())) {
+            if (!ValidationUtil.isEmpty(map.get("instanceId").toString())) {
                 instanceId = map.get("instanceId").toString();
                 // 如果是旧流程则执行一步
                 flowExecute(jgChangeRegistrationReform.getSequenceNbr(), instanceId, "0", "");