Commit 197e3078 authored by tianyiming's avatar tianyiming

fix(core): 修正orgBranchCode为"50*X"时的处理逻辑,导致单据无法审批问题

parent 37a5e7f9
...@@ -2445,7 +2445,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -2445,7 +2445,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
String orgBranchCode = (String) supervisionInfo.get("orgBranchCode"); String orgBranchCode = (String) supervisionInfo.get("orgBranchCode");
String orgBranchName = (String) supervisionInfo.get("orgBranchName"); String orgBranchName = (String) supervisionInfo.get("orgBranchName");
supervisionInfo.put("orgBranchCode", "50*X".equals(orgBranchCode) ? null : orgBranchCode + "_" + orgBranchName); supervisionInfo.put("orgBranchCode", "50*X".equals(orgBranchCode) ? null : orgBranchCode + "_" + orgBranchName);
supervisionInfo.put("hasOrgBranchCode", true); supervisionInfo.put("hasOrgBranchCode", "50*X".equals(orgBranchCode) ? false : true);
detail.putAll(supervisionInfo); detail.putAll(supervisionInfo);
} }
detail.remove("safetyManager"); detail.remove("safetyManager");
...@@ -2531,7 +2531,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -2531,7 +2531,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
String orgBranchCode = (String) supervisionInfo.get("orgBranchCode"); String orgBranchCode = (String) supervisionInfo.get("orgBranchCode");
String orgBranchName = (String) supervisionInfo.get("orgBranchName"); String orgBranchName = (String) supervisionInfo.get("orgBranchName");
supervisionInfo.put("orgBranchCode", "50*X".equals(orgBranchCode) ? null : orgBranchCode + "_" + orgBranchName); supervisionInfo.put("orgBranchCode", "50*X".equals(orgBranchCode) ? null : orgBranchCode + "_" + orgBranchName);
supervisionInfo.put("hasOrgBranchCode", true); supervisionInfo.put("hasOrgBranchCode", "50*X".equals(orgBranchCode) ? false : true);
detail.putAll(supervisionInfo); detail.putAll(supervisionInfo);
} }
// 附件解析 // 附件解析
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment