Merge branch 'master_cj_zq' into master_sample_order

@@ -548,6 +548,8 @@ public class FundCoordinationController extends DefaultBaseController {
             deptName = "温州";
         } else if ("ZT".equals(deptCode)) {
             deptName = "紫铜";
+        } else if ("WM".equals(deptCode)) {
+            deptName = "外贸";
         }
         data.setDeptName(deptName);
         // 获取当前人员的待办任务数据

@@ -463,7 +463,9 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
             deptName = "温州";
         } else if ("ZT".equals(deptCode)) {
             deptName = "紫铜";
-        } else {
+        } else if ("WM".equals(deptCode)) {
+            deptName = "外贸";
+        }  else {
             deptName = ""; // 包括 null 和其他无效值
         }
         return deptName;

@@ -149,6 +149,7 @@ public class TransactorHandler {
         codeList.add("SZ");
         codeList.add("WZ");
         codeList.add("ZT");
+        codeList.add("WM");
         List<SysDept> byCodeList = sysDeptService.findByCodeList(codeList);
         List<String> deptIds = byCodeList.stream()
                 .map(SysDept::getId)
@@ -225,6 +226,13 @@ public class TransactorHandler {
         if (ztBoolean) {
             result = "ZT";
         }
+        //外贸
+        String wm = codeToIdMap.get("WM");
+        List<String> wmList = deptChildIdMap.get(wm);
+        boolean wmBoolean = hasIntersection(wmList, userDeptIds);
+        if (wmBoolean) {
+            result = "WM";
+        }
 
 
         log.info("================== returnDeptCode invoke end, result:{}", result);

@@ -165,6 +165,9 @@ public class FlowTaskServiceImpl implements FlowTaskService {
         } else if ("ZT".equals(deptCode)) {
             //紫铜办事处分管
             roleCode = "ztbscfg";
+        } else if ("WM".equals(deptCode)) {
+            //外贸办事处分管
+            roleCode = "wmbscfg";
         }
         if (nodeCode.startsWith("fund_coordination_3-")) {
             //办事处分管