Commit e7b6cd8b7be8a11e722e5b36bd72847069161da5
Merge branch 'master_cj_zq' into master_sample_order
Showing
4 changed files
with
16 additions
and
1 deletions
xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/ledger/FundCoordinationController.java
| @@ -548,6 +548,8 @@ public class FundCoordinationController extends DefaultBaseController { | @@ -548,6 +548,8 @@ public class FundCoordinationController extends DefaultBaseController { | ||
| 548 | deptName = "温州"; | 548 | deptName = "温州"; |
| 549 | } else if ("ZT".equals(deptCode)) { | 549 | } else if ("ZT".equals(deptCode)) { |
| 550 | deptName = "紫铜"; | 550 | deptName = "紫铜"; |
| 551 | + } else if ("WM".equals(deptCode)) { | ||
| 552 | + deptName = "外贸"; | ||
| 551 | } | 553 | } |
| 552 | data.setDeptName(deptName); | 554 | data.setDeptName(deptName); |
| 553 | // 获取当前人员的待办任务数据 | 555 | // 获取当前人员的待办任务数据 |
xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/order/PurchaseOrderInfoController.java
| @@ -463,7 +463,9 @@ public class PurchaseOrderInfoController extends DefaultBaseController { | @@ -463,7 +463,9 @@ public class PurchaseOrderInfoController extends DefaultBaseController { | ||
| 463 | deptName = "温州"; | 463 | deptName = "温州"; |
| 464 | } else if ("ZT".equals(deptCode)) { | 464 | } else if ("ZT".equals(deptCode)) { |
| 465 | deptName = "紫铜"; | 465 | deptName = "紫铜"; |
| 466 | - } else { | 466 | + } else if ("WM".equals(deptCode)) { |
| 467 | + deptName = "外贸"; | ||
| 468 | + } else { | ||
| 467 | deptName = ""; // 包括 null 和其他无效值 | 469 | deptName = ""; // 包括 null 和其他无效值 |
| 468 | } | 470 | } |
| 469 | return deptName; | 471 | return deptName; |
| @@ -149,6 +149,7 @@ public class TransactorHandler { | @@ -149,6 +149,7 @@ public class TransactorHandler { | ||
| 149 | codeList.add("SZ"); | 149 | codeList.add("SZ"); |
| 150 | codeList.add("WZ"); | 150 | codeList.add("WZ"); |
| 151 | codeList.add("ZT"); | 151 | codeList.add("ZT"); |
| 152 | + codeList.add("WM"); | ||
| 152 | List<SysDept> byCodeList = sysDeptService.findByCodeList(codeList); | 153 | List<SysDept> byCodeList = sysDeptService.findByCodeList(codeList); |
| 153 | List<String> deptIds = byCodeList.stream() | 154 | List<String> deptIds = byCodeList.stream() |
| 154 | .map(SysDept::getId) | 155 | .map(SysDept::getId) |
| @@ -225,6 +226,13 @@ public class TransactorHandler { | @@ -225,6 +226,13 @@ public class TransactorHandler { | ||
| 225 | if (ztBoolean) { | 226 | if (ztBoolean) { |
| 226 | result = "ZT"; | 227 | result = "ZT"; |
| 227 | } | 228 | } |
| 229 | + //外贸 | ||
| 230 | + String wm = codeToIdMap.get("WM"); | ||
| 231 | + List<String> wmList = deptChildIdMap.get(wm); | ||
| 232 | + boolean wmBoolean = hasIntersection(wmList, userDeptIds); | ||
| 233 | + if (wmBoolean) { | ||
| 234 | + result = "WM"; | ||
| 235 | + } | ||
| 228 | 236 | ||
| 229 | 237 | ||
| 230 | log.info("================== returnDeptCode invoke end, result:{}", result); | 238 | log.info("================== returnDeptCode invoke end, result:{}", result); |
| @@ -165,6 +165,9 @@ public class FlowTaskServiceImpl implements FlowTaskService { | @@ -165,6 +165,9 @@ public class FlowTaskServiceImpl implements FlowTaskService { | ||
| 165 | } else if ("ZT".equals(deptCode)) { | 165 | } else if ("ZT".equals(deptCode)) { |
| 166 | //紫铜办事处分管 | 166 | //紫铜办事处分管 |
| 167 | roleCode = "ztbscfg"; | 167 | roleCode = "ztbscfg"; |
| 168 | + } else if ("WM".equals(deptCode)) { | ||
| 169 | + //外贸办事处分管 | ||
| 170 | + roleCode = "wmbscfg"; | ||
| 168 | } | 171 | } |
| 169 | if (nodeCode.startsWith("fund_coordination_3-")) { | 172 | if (nodeCode.startsWith("fund_coordination_3-")) { |
| 170 | //办事处分管 | 173 | //办事处分管 |