修改bug

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

@@ -115,6 +115,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getBaseMapper().selectOne(lambdaSelect);
         JSONObject map = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
         map.remove("status");
+        // 安全管理员
+        if (map.containsKey("safetyManagerName")){
+            map.put("safetyManager", map.get("safetyManagerName"));
+        }
         IdxBizJgUseInfo useInfo = new IdxBizJgUseInfo();
         BeanUtil.copyProperties(map, useInfo);
         // 城市
@@ -203,6 +207,11 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             jgUseRegistration.setReceiveOrgName(splitMaintenanceUnitCode[1]);
 
         }
+        // 安全管理员
+        if (map.containsKey("safetyManager")) {
+            String[] data = String.valueOf(map.getString("safetyManager")).split("_");
+            map.put("safetyManagerName", data[1]);
+        }
         // 使用单位提交
         jgUseRegistration.setUseUnitCreditCode(reginParams.getCompany().getCompanyCode());
         jgUseRegistration.setCreateUserId(reginParams.getUserModel().getUserId());
@@ -481,7 +490,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             // 驳回到使用单位
             dto.setNextExecuteUserCompanyCode(jgUseRegistration.getUseUnitCreditCode());
         } else {
-            dto.setNextExecuteUserCompanyCode(jgUseRegistration.getReceiveOrgCode());
+            dto.setNextExecuteUserCompanyCode(jgUseRegistration.getReceiveCompanyCode());
         }
         ProcessTaskDTO complete = cmWorkflowService.complete(jgUseRegistration.getNextTaskId(), dto);
         ArrayList<ProcessTaskDTO> processTaskDTOS = new ArrayList<>();