fix(jg):监察审批范围调整

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

@@ -1586,13 +1586,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 map.put("approvalStatus", "提交");
             }
 
-            String companyCode = "";
+            String orgCode = "";
             if (jsonObject.containsKey("orgBranchCode") && !ObjectUtils.isEmpty(jsonObject.get("orgBranchCode"))) {
-                String orgBranchCode = String.valueOf(jsonObject.get("orgBranchCode")).split("_")[0];
-                String orgCode = orgBranchCode.substring(0, orgBranchCode.lastIndexOf("*"));
-                HashMap<String, Object> parentMessage = (HashMap<String, Object>) Privilege.companyClient.queryByOrgcode(orgCode).getResult();
-                CompanyModel parentModel = JSON.parseObject(JSON.toJSONString(parentMessage.get("compnay")), CompanyModel.class);
-                companyCode = parentModel.getCompanyCode();
+                orgCode = String.valueOf(jsonObject.get("orgBranchCode")).split("_")[0];;
             }
             //驳回
             if ("1".equals(operate)){
@@ -1606,19 +1602,21 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 if("2".equals(jgUseRegistration.getRegType())) {
                     // 二级驳回到监察单位
                     if(WorkFlowStatusEnum.USE_PRELIMINARY.getPass().equals(jgUseRegistration.getStatus()) || WorkFlowStatusEnum.USE_PRELIMINARY.getReject().equals(jgUseRegistration.getStatus())){
-                        dto.setNextExecuteUserCompanyCode(companyCode);
+                        map.put("nextExecuteUserOrgCode", orgCode);
                         dto.setResultCode("approvalStatus");
                         map.put("approvalStatus", "10");
                         operate = "2";
                     }else if(WorkFlowStatusEnum.USE_SAFETY_CHECK.getPass().equals(jgUseRegistration.getStatus())|| WorkFlowStatusEnum.USE_SAFETY_CHECK.getReject().equals(jgUseRegistration.getStatus())){
                         //安全监察驳回到一级
                         dto.setNextExecuteUserCompanyCode(jgUseRegistration.getReceiveCompanyCode());
+                        map.put("nextExecuteUserOrgCode", "");
                         dto.setResultCode("approvalStatus");
                         map.put("approvalStatus", operate);
                         operate = "2";
                     }else{
                         dto.setNextExecuteUserCompanyCode(jgUseRegistration.getReceiveCompanyCode());
                         dto.setResultCode("approvalStatus");
+                        map.put("nextExecuteUserOrgCode", "");
                         map.put("approvalStatus", operate);
                     }
                 } else {
@@ -1633,10 +1631,11 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 if ("2".equals(jgUseRegistration.getRegType()) && (WorkFlowStatusEnum.USE_RECEIVE.getPass().equals(jgUseRegistration.getStatus()) || WorkFlowStatusEnum.USE_RECEIVE.getReject().equals(jgUseRegistration.getStatus()))){
                     dto.setResultCode("approvalStatus");
                     map.put("approvalStatus", "9");
-                    dto.setNextExecuteUserCompanyCode(companyCode);
+                    map.put("nextExecuteUserOrgCode", orgCode);
                 }else{//新增登记
                     map.put("approvalStatus", operate);
                     dto.setResultCode("approvalStatus");
+                    map.put("nextExecuteUserOrgCode", "");
                     dto.setNextExecuteUserCompanyCode(jgUseRegistration.getReceiveCompanyCode());
                 }
             }