楚江ERP:客户资信-获取当前人下部门所有人包含子部门

@@ -215,7 +215,7 @@ public class CustomerCreditController extends DefaultBaseController {
     }
 
     /**
-     * 获取当前人下部门所有人
+     * 获取当前人下部门所有人包含子部门
      */
     @ApiOperation("获取当前人下部门所有人")
     @GetMapping("/getAllUser")

@@ -17,6 +17,7 @@ import com.lframework.starter.web.inner.bo.system.user.GetSysUserBo;
 import com.lframework.starter.web.inner.entity.SysDept;
 import com.lframework.starter.web.inner.entity.SysUser;
 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.SysUserService;
 import com.lframework.starter.web.inner.vo.system.user.QuerySysUserVo;
 import com.lframework.xingyun.sc.bo.customer.credit.GetCorePersonnelBo;
@@ -91,6 +92,8 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
     private RedisHandler redisHandler;
     @Resource
     private FlowTaskWrapperMapper flowTaskWrapperMapper;
+    @Resource
+    private SysUserDeptService sysUserDeptService;
 
     @Override
     public PageResult<CustomerCredit> query(Integer pageIndex, Integer pageSize, QueryCustomerCreditVo vo) {
@@ -1143,28 +1146,19 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
     /**
      * 获取当前人下部门所有人
      *
-     * @return 获取当前人下部门所有人
+     * @return 获取当前人下部门所有人包含子部门
      */
     @Override
     public List<SysUser> getAllUser() {
         //获取当前人员ID
         String currentUserId = SecurityUtil.getCurrentUser().getId();
-        SysUser sysUser = sysUserService.findById(currentUserId);
-        if (sysUser != null) {
-            GetSysUserBo getSysUserBo = new GetSysUserBo(sysUser);
-            //部门
-            List<String> depts = getSysUserBo.getDepts();
-            if (CollectionUtils.isNotEmpty(depts)) {
-                String deptId = depts.get(0);
-                QuerySysUserVo vo = new QuerySysUserVo();
-                vo.setDeptId(deptId);
-                return sysUserService.query(vo);
-            } else {
-                throw new IllegalArgumentException("部门名称为空");
-            }
-        } else {
-            throw new IllegalArgumentException("人员不存在");
-        }
+        List<String> userIdList = new ArrayList<>();
+        userIdList.add(currentUserId);
+
+        Map<String, List<String>> userIdMap = sysUserDeptService.mapAllUserByUserId(userIdList, true);
+        List<String> userIds = userIdMap.get(currentUserId);
+
+        return sysUserService.listByUserId(userIds);
     }
 
     /**
@@ -1283,10 +1277,12 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
         }
         if (StringUtil.isNotEmpty(data.getEnterpriseType())) {
             String enterpriseType;
-            if ("DISTRIBUTOR".equals(data.getEnterpriseType())) {
+            if ("DEALER".equals(data.getEnterpriseType())) {
                 enterpriseType = "经销商";
-            } else {
+            } else if ("TERMINAL".equals(data.getEnterpriseType())) {
                 enterpriseType = "终端";
+            } else {
+                enterpriseType = data.getEnterpriseType();
             }
             dataModel.put("enterpriseType", enterpriseType);
         }