Commit 82d063d7525a0e5ce06235dfde138bac3266fc5a

Authored by 房远帅
1 parent d34e1ee8

新增外贸办事处

... ... @@ -548,6 +548,8 @@ public class FundCoordinationController extends DefaultBaseController {
548 548 deptName = "温州";
549 549 } else if ("ZT".equals(deptCode)) {
550 550 deptName = "紫铜";
  551 + } else if ("WM".equals(deptCode)) {
  552 + deptName = "外贸";
551 553 }
552 554 data.setDeptName(deptName);
553 555 // 获取当前人员的待办任务数据
... ...
... ... @@ -463,7 +463,9 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
463 463 deptName = "温州";
464 464 } else if ("ZT".equals(deptCode)) {
465 465 deptName = "紫铜";
466   - } else {
  466 + } else if ("WM".equals(deptCode)) {
  467 + deptName = "外贸";
  468 + } else {
467 469 deptName = ""; // 包括 null 和其他无效值
468 470 }
469 471 return deptName;
... ...
... ... @@ -149,6 +149,7 @@ public class TransactorHandler {
149 149 codeList.add("SZ");
150 150 codeList.add("WZ");
151 151 codeList.add("ZT");
  152 + codeList.add("WM");
152 153 List<SysDept> byCodeList = sysDeptService.findByCodeList(codeList);
153 154 List<String> deptIds = byCodeList.stream()
154 155 .map(SysDept::getId)
... ... @@ -225,6 +226,13 @@ public class TransactorHandler {
225 226 if (ztBoolean) {
226 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 238 log.info("================== returnDeptCode invoke end, result:{}", result);
... ...
... ... @@ -157,6 +157,9 @@ public class FlowTaskServiceImpl implements FlowTaskService {
157 157 } else if ("ZT".equals(deptCode)) {
158 158 //紫铜办事处分管
159 159 roleCode = "ztbscfg";
  160 + } else if ("WM".equals(deptCode)) {
  161 + //外贸办事处分管
  162 + roleCode = "wmbscfg";
160 163 }
161 164 if (nodeCode.startsWith("fund_coordination_3-")) {
162 165 //办事处分管
... ...