From 8a128c37e9c0af139083862957541d6f44376d15 Mon Sep 17 00:00:00 2001
From: panshuling321 <panshuling321@163.com>
Date: Wed, 28 Sep 2022 11:11:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=8E=B7=E5=8F=96=E8=BF=90?=
 =?UTF-8?q?=E7=BB=B4=E4=BA=BA=E5=91=98=E5=88=86=E9=A1=B5=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/WorkUserServiceImpl.java     | 30 +++++++++++--------
 .../resources/mapper/XhpcWorkUserMapper.xml   |  2 +-
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkUserServiceImpl.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkUserServiceImpl.java
index 473af725..57660999 100644
--- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkUserServiceImpl.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkUserServiceImpl.java
@@ -22,7 +22,6 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 
 @Service
@@ -92,15 +91,20 @@ public class WorkUserServiceImpl implements WorkUserService {
     public List<XhpcWorkUserDomain> getPage(Map<String, Object> params){
         Map<String, Object> deptParams = new HashMap<>();
         deptParams.put("tenantId", params.get("tenantId"));
-
-        String deptIds = params.get("deptId") + "";
-        for(int i=0; i< 3;i++){
-            deptParams.put("parentDeptIds", params.get("deptId"));
-            List<XhpcWorkDeptDomain> deptDomainList = deptMapper.selectListByParams(deptParams);
-            deptIds = deptDomainList.stream().map(dept->dept.getWorkDeptId().toString()).collect(Collectors.joining(","));
+        if (params.get("deptId") != null){
+            String deptIds = params.get("deptId") + "";
+            for(int i=0; i< 3;i++){
+                deptParams.put("parentDeptIds", deptIds);
+                List<XhpcWorkDeptDomain> deptDomainList = deptMapper.selectListByParams(deptParams);
+                for(XhpcWorkDeptDomain workDeptDomain: deptDomainList){
+                    deptIds = deptIds + "," + workDeptDomain.getWorkDeptId();
+                }
+            }
+            params.put("deptIds", deptIds);
+        }
+        if(params.get("deptIds") != null){
+            params.put("deptId", null);
         }
-
-       params.put("deptIds", deptIds);
         return workUserMapper.selectPage(params);
     }
 
@@ -167,10 +171,10 @@ public class WorkUserServiceImpl implements WorkUserService {
     public Boolean updateDomain(XhpcWorkUserDomain domain){
 
         SysUser user =  userMapper.selectUserByUserName(domain.getLoginName(), domain.getTenantId());
-        SysUser sysUser = userMapper.checkPhoneUnique(domain.getPhone(), domain.getTenantId());
-        if(StringUtils.isNotNull(sysUser)){
-            throw new CustomException("更新用户'" + domain.getUserName() + "'失败，手机号码已存在");
-        }
+//        SysUser sysUser = userMapper.checkPhoneUnique(domain.getPhone(), domain.getTenantId());
+//        if(StringUtils.isNotNull(sysUser)){
+//            throw new CustomException("更新用户'" + domain.getUserName() + "'失败，手机号码已存在");
+//        }
 
         user.setPhonenumber(domain.getPhone());
         user.setEmail(domain.getEmail());
diff --git a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkUserMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkUserMapper.xml
index d09971ea..ac1228ad 100644
--- a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkUserMapper.xml
+++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkUserMapper.xml
@@ -121,7 +121,7 @@
     left join xhpc_work_dept d on u.dept_id=d.work_dept_id
     left join sys_user su on su.phonenumber = u.phone
     where u.del_flag=0 and d.del_flag=0
-    <if test="params.deptId!=null">
+    <if test="params.deptId!=null and params.deptId!=''">
       and (d.work_dept_id=#{params.deptId} or d.parent_dept_id=#{params.deptId})
     </if>
     <if test="params.type!=null and params.type!=''">