楚江ERP：1:判断当前人员是哪个办事处下的;2:客户资信编码生成修改

@@ -41,7 +41,6 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;

@@ -360,6 +360,12 @@ public class CustomerCredit extends BaseEntity implements BaseDto {
     private String userId;
 
     /**
+     * 办事处code(非持久化字段)
+     */
+    @TableField(exist = false)
+    private String deptCode;
+
+    /**
      * 创建人ID
      */
     @TableField(fill = FieldFill.INSERT)

 package com.lframework.xingyun.sc.handlers;
 
 import com.lframework.starter.web.core.utils.JsonUtil;
-import com.lframework.starter.web.inner.mappers.system.SysUserRoleMapper;
+import com.lframework.starter.web.inner.entity.SysDept;
+import com.lframework.starter.web.inner.entity.SysUserDept;
+import com.lframework.starter.web.inner.service.system.SysDeptService;
 import com.lframework.starter.web.inner.service.system.SysUserDeptService;
 import com.lframework.starter.web.inner.service.system.SysUserRoleService;
 import com.lframework.xingyun.basedata.entity.Workshop;
@@ -9,12 +11,9 @@ import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Component;
-
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Component
 @Slf4j
@@ -26,6 +25,8 @@ public class TransactorHandler {
     private SysUserRoleService sysUserRoleService;
     @Resource
     private WorkshopService workshopService;
+    @Resource
+    private SysDeptService sysDeptService;
 
 
     /**
@@ -94,4 +95,115 @@ public class TransactorHandler {
         log.info("================== listByRoleAndWorkshop invoke end, result:{}", JsonUtil.toJsonString(result));
         return result;
     }
+
+    /**
+     * 判断当前人员是哪个办事处下的
+     *
+     * @param userId 业务数据创建人/更新人ID
+     * @return List<String>
+     */
+    public String returnDeptCode(String userId) {
+        log.info("================== returnDeptCode invoke start, userId:{}", userId);
+        List<String> codeList = new ArrayList<>();
+        codeList.add("BF");
+        codeList.add("CZ");
+        codeList.add("DG");
+        codeList.add("FS");
+        codeList.add("NB");
+        codeList.add("SZ");
+        codeList.add("WZ");
+        codeList.add("ZT");
+        List<SysDept> byCodeList = sysDeptService.findByCodeList(codeList);
+        List<String> deptIds = byCodeList.stream()
+                .map(SysDept::getId)
+                .collect(Collectors.toList());
+        Map<String, String> codeToIdMap = byCodeList.stream()
+                .collect(Collectors.toMap(
+                        SysDept::getCode,
+                        SysDept::getId
+                ));
+
+        Map<String, List<String>> deptChildIdMap = sysDeptService.getDeptChildIdMap(deptIds);
+        List<SysUserDept> userDepts = userDeptService.getByUserId(userId);
+        //当前人部门
+        List<String> userDeptIds = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(userDepts)) {
+            userDeptIds = userDepts.stream()
+                    .map(SysUserDept::getDeptId)
+                    .collect(Collectors.toList());
+        }
+        String result = null;
+        //北方
+        String bf = codeToIdMap.get("BF");
+        List<String> bfList = deptChildIdMap.get(bf);
+        boolean bfBoolean = hasIntersection(bfList, userDeptIds);
+        if (bfBoolean) {
+            result = "BF";
+        }
+        //常州
+        String cz = codeToIdMap.get("CZ");
+        List<String> czList = deptChildIdMap.get(cz);
+        boolean czBoolean = hasIntersection(czList, userDeptIds);
+        if (czBoolean) {
+            result = "CZ";
+        }
+        //东莞
+        String dg = codeToIdMap.get("DG");
+        List<String> dgList = deptChildIdMap.get(dg);
+        boolean dgBoolean = hasIntersection(dgList, userDeptIds);
+        if (dgBoolean) {
+            result = "DG";
+        }
+        //佛山
+        String fs = codeToIdMap.get("FS");
+        List<String> fsList = deptChildIdMap.get(fs);
+        boolean fsBoolean = hasIntersection(fsList, userDeptIds);
+        if (fsBoolean) {
+            result = "FS";
+        }
+        //宁波
+        String nb = codeToIdMap.get("NB");
+        List<String> nbList = deptChildIdMap.get(nb);
+        boolean nbBoolean = hasIntersection(nbList, userDeptIds);
+        if (nbBoolean) {
+            result = "NB";
+        }
+        //苏州
+        String sz = codeToIdMap.get("SZ");
+        List<String> szList = deptChildIdMap.get(sz);
+        boolean szBoolean = hasIntersection(szList, userDeptIds);
+        if (szBoolean) {
+            result = "SZ";
+        }
+        //温州
+        String wz = codeToIdMap.get("WZ");
+        List<String> wzList = deptChildIdMap.get(wz);
+        boolean wzBoolean = hasIntersection(wzList, userDeptIds);
+        if (wzBoolean) {
+            result = "WZ";
+        }
+        //紫铜
+        String zt = codeToIdMap.get("ZT");
+        List<String> ztList = deptChildIdMap.get(zt);
+        boolean ztBoolean = hasIntersection(ztList, userDeptIds);
+        if (ztBoolean) {
+            result = "ZT";
+        }
+
+
+        log.info("================== returnDeptCode invoke end, result:{}", result);
+        return result;
+    }
+
+    //判断两个集合是否有交集
+    public static <T> boolean hasIntersection(Collection<T> a, Collection<T> b) {
+        if (a.isEmpty() || b.isEmpty()) {
+            return false;
+        }
+        // 将较小的集合作为 contains 的目标，提升性能
+        Collection<T> smaller = a.size() <= b.size() ? a : b;
+        Collection<T> larger = a.size() > b.size() ? a : b;
+
+        return larger.stream().anyMatch(smaller::contains);
+    }
 }

@@ -35,6 +35,7 @@ import com.lframework.starter.web.core.annotations.oplog.OpLog;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.xingyun.sc.entity.CustomerCreditHistory;
+import com.lframework.xingyun.sc.handlers.TransactorHandler;
 import com.lframework.xingyun.sc.mappers.CustomerCreditMapper;
 import com.lframework.xingyun.sc.service.customer.CorePersonnelHistoryService;
 import com.lframework.xingyun.sc.service.customer.CorePersonnelService;
@@ -94,6 +95,8 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
     private SysUserDeptService sysUserDeptService;
     @Value("${customer.credit.export:/web/service/erp/xingyun/export/templates/}")
     private String exportTemplate;
+    @Resource
+    private TransactorHandler transactorHandler;
 
     @Override
     public PageResult<CustomerCredit> query(Integer pageIndex, Integer pageSize, QueryCustomerCreditVo vo) {
@@ -315,6 +318,8 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
         if (!"IMPORT".equals(vo.getImportType())) {
             // 开启审核
             data.setUserId(SecurityUtil.getCurrentUser().getId());
+            String deptCode = transactorHandler.returnDeptCode(SecurityUtil.getCurrentUser().getId());
+            data.setDeptCode(deptCode);
             flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data);
         }
 
@@ -906,6 +911,8 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
 
         //开启审核
         vo.setUserId(SecurityUtil.getCurrentUser().getId());
+        String deptCode = transactorHandler.returnDeptCode(SecurityUtil.getCurrentUser().getId());
+        data.setDeptCode(deptCode);
         flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, vo);
     }
 
@@ -1270,14 +1277,26 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
         if (sysUser != null) {
             GetSysUserBo getSysUserBo = new GetSysUserBo(sysUser);
             //部门名称
-            String deptName = getSysUserBo.getDeptName();
-            if (StringUtil.isNotEmpty(deptName)) {
-                //获取办事处首字母
-                String prefixPinyin = getPrefixPinyin(deptName);
-                //已使用编号
-                Set<String> existingNumbers = customerCreditMapper.getGenerateCode(prefixPinyin);
-
-                return generateNextAvailableNumber(prefixPinyin, existingNumbers);
+            List<String> depts = getSysUserBo.getDepts();
+            if (CollectionUtils.isNotEmpty(depts)) {
+                SysDept sysDept = sysDeptService.findById(depts.get(0));
+                String parentId = sysDept.getParentId();
+                if (StringUtil.isNotEmpty(parentId)) {
+                    SysDept sysDept1 = sysDeptService.findById(parentId);
+                    //获取办事处首字母
+                    String prefixPinyin = getPrefixPinyin(sysDept1.getName());
+                    //已使用编号
+                    Set<String> existingNumbers = customerCreditMapper.getGenerateCode(prefixPinyin);
+
+                    return generateNextAvailableNumber(prefixPinyin, existingNumbers);
+                } else {
+                    //获取办事处首字母
+                    String prefixPinyin = getPrefixPinyin(sysDept.getName());
+                    //已使用编号
+                    Set<String> existingNumbers = customerCreditMapper.getGenerateCode(prefixPinyin);
+
+                    return generateNextAvailableNumber(prefixPinyin, existingNumbers);
+                }
             } else {
                 throw new DefaultClientException("部门名称为空");
             }