Skip to content

A
amos-boot-biz
Commit 37a5e7f9 authored by tianyiming's avatar tianyiming
Browse files
Options

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

parent f0d71a38
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
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
View file @ 37a5e7f9
...@@ -2444,7 +2444,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -2444,7 +2444,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
if (!ObjectUtils.isEmpty(supervisionInfo) && !StringUtils.isEmpty(supervisionInfo.get("orgBranchCode"))) { if (!ObjectUtils.isEmpty(supervisionInfo) && !StringUtils.isEmpty(supervisionInfo.get("orgBranchCode"))) {
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", orgBranchCode + "_" + orgBranchName); supervisionInfo.put("orgBranchCode", "50*X".equals(orgBranchCode) ? null : orgBranchCode + "_" + orgBranchName);
supervisionInfo.put("hasOrgBranchCode", true); supervisionInfo.put("hasOrgBranchCode", true);
detail.putAll(supervisionInfo); detail.putAll(supervisionInfo);
} }
...@@ -2530,7 +2530,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -2530,7 +2530,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
if (!ObjectUtils.isEmpty(supervisionInfo) && !StringUtils.isEmpty(supervisionInfo.get("orgBranchCode"))) { if (!ObjectUtils.isEmpty(supervisionInfo) && !StringUtils.isEmpty(supervisionInfo.get("orgBranchCode"))) {
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", orgBranchCode + "_" + orgBranchName); supervisionInfo.put("orgBranchCode", "50*X".equals(orgBranchCode) ? null : orgBranchCode + "_" + orgBranchName);
supervisionInfo.put("hasOrgBranchCode", true); supervisionInfo.put("hasOrgBranchCode", 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