From 0e0ea4a79201c2594dfc7b1e582e2acf7ea96bde Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Fri, 25 Mar 2022 16:04:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=92=E8=89=B2=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/SysUserController.java    |  3 ++-
 .../modules/system/mapper/SysUserMapper.java    |  6 ++++--
 .../modules/system/mapper/xml/SysUserMapper.xml | 17 ++++++++++++++++-
 .../modules/system/service/ISysUserService.java |  2 ++
 .../service/impl/SysUserDepartServiceImpl.java  | 15 +++++----------
 .../system/service/impl/SysUserServiceImpl.java | 13 +++++++++++++
 6 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
index 576b65751..33c4037b9 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
@@ -364,7 +364,8 @@ public class SysUserController {
     public Result<List<DepartIdModel>> getUserDepartsList(@RequestParam(name = "userId", required = true) String userId) {
         Result<List<DepartIdModel>> result = new Result<>();
         try {
-            List<DepartIdModel> depIdModelList = this.sysUserDepartService.queryDepartIdsOfUser(userId);
+//            List<DepartIdModel> depIdModelList = this.sysUserDepartService.queryDepartIdsOfUser(userId);
+            List<DepartIdModel> depIdModelList = this.sysUserService.getDepIdsByUserId(userId);
             if (depIdModelList != null && depIdModelList.size() > 0) {
                 result.setSuccess(true);
                 result.setMessage("查找成功");
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java
index e93b130f6..251bde680 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java
@@ -1,14 +1,15 @@
 package com.jero.modules.system.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.apache.ibatis.annotations.Param;
+import com.jero.modules.system.entity.SysDepart;
 import com.jero.modules.system.entity.SysUser;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jero.modules.system.model.SysUserSysDepartModel;
 import com.jero.modules.system.vo.SysUserDepVo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -49,6 +50,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
 	 */
 	List<SysUserDepVo> getDepNamesByUserIds(@Param("userIds")List<String> userIds);
 
+	List<SysDepart> getDepIdsByUserId(@Param("userId") String userId);
 	/**
 	 *  根据部门Ids,查询部门下用户信息
 	 * @param page
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml
index 4d90c7e31..74ccaa81b 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml
@@ -26,7 +26,7 @@
 
 	<!-- 查询用户的所属部门名称信息 -->
 	<select id="getDepNamesByUserIds" resultType="com.jero.modules.system.vo.SysUserDepVo">
-		SELECT
+		SELECT distinct
 		d.depart_name,
 		dru.user_id
 		FROM
@@ -42,6 +42,21 @@
 		</foreach>
 	</select>
 
+	<!-- 查询用户的所属部门id -->
+	<select id="getDepIdsByUserId" resultType="com.jero.modules.system.entity.SysDepart">
+		SELECT
+		d.depart_name departName,
+		d.id id
+		FROM
+		sys_depart_role_user dru,
+		sys_depart_role dr,
+		sys_depart d
+		WHERE
+		d.id = dr.depart_id
+		and dr.id = dru.drole_id
+		and dru.user_id = #{userId}
+	</select>
+
 	<!-- 通过多个部门IDS，查询部门下的用户信息 -->
 	<select id="getUserByDepIds" resultType="com.jero.modules.system.entity.SysUser">
 		select * from sys_user where del_flag = 0
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java
index 2b9368164..055ab14dd 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java
@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.jero.common.api.vo.Result;
 import com.jero.common.system.vo.SysUserCacheInfo;
 import com.jero.modules.system.entity.SysUser;
+import com.jero.modules.system.model.DepartIdModel;
 import com.jero.modules.system.model.SysUserSysDepartModel;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -118,6 +119,7 @@ public interface ISysUserService extends IService<SysUser> {
 	 */
 	public Map<String,String> getDepNamesByUserIds(List<String> userIds);
 
+	public List<DepartIdModel> getDepIdsByUserId(String userId);
     /**
      * 根据部门 Id 和 QueryWrapper 查询
      *
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserDepartServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserDepartServiceImpl.java
index 0f5b77ab9..fe36608ea 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserDepartServiceImpl.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserDepartServiceImpl.java
@@ -1,11 +1,7 @@
 package com.jero.modules.system.service.impl;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Collectors;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.util.oConvertUtils;
 import com.jero.modules.system.entity.SysDepart;
 import com.jero.modules.system.entity.SysUser;
@@ -18,8 +14,9 @@ import com.jero.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <P>
@@ -65,8 +62,6 @@ public class SysUserDepartServiceImpl extends ServiceImpl<SysUserDepartMapper, S
 			e.fillInStackTrace();
 		}
 		return null;
-		
-		
 	}
 
 
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java
index 0730eabe7..99334d94b 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java
@@ -18,6 +18,7 @@ import com.jero.common.util.oConvertUtils;
 import com.jero.modules.base.service.BaseCommonService;
 import com.jero.modules.system.entity.*;
 import com.jero.modules.system.mapper.*;
+import com.jero.modules.system.model.DepartIdModel;
 import com.jero.modules.system.model.SysUserSysDepartModel;
 import com.jero.modules.system.service.ISysUserService;
 import com.jero.modules.system.vo.SysUserDepVo;
@@ -264,6 +265,18 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 		return res;
 	}
 
+	@Override
+	public List<DepartIdModel> getDepIdsByUserId(String userId) {
+		List<SysDepart> departList = this.baseMapper.getDepIdsByUserId(userId);
+		List<DepartIdModel> depIdModelList = new ArrayList<>();
+		if(departList != null || departList.size() > 0) {
+			for(SysDepart depart : departList) {
+				depIdModelList.add(new DepartIdModel().convertByUserDepart(depart));
+			}
+		}
+		return depIdModelList;
+	}
+
 	@Override
 	public IPage<SysUser> getUserByDepartIdAndQueryWrapper(Page<SysUser> page, String departId, QueryWrapper<SysUser> queryWrapper) {
 		LambdaQueryWrapper<SysUser> lambdaQueryWrapper = queryWrapper.lambda();