From 054978e0a1dd0e571b27de6f3e4edce740a51aa1 Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Tue, 14 Nov 2023 10:47:30 +0800
Subject: [PATCH] =?UTF-8?q?bug:=20=E7=9B=91=E6=8E=A7=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E8=8B=A5=E7=94=A8=E6=88=B7=E5=B7=B2=E7=A6=81=E7=94=A8=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=BE=E7=A4=BA=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adc/da/sys/controller/UserEOController.java   | 15 +++++++++++++++
 .../main/java/com/adc/da/sys/dao/UserEODao.java   |  5 +++++
 .../com/adc/da/sys/service/IUserEOService.java    |  2 ++
 .../da/sys/service/impl/UserEOServiceImpl.java    | 10 ++++++++++
 .../resources/mybatis/mapper/sys/UserEOMapper.xml | 12 ++++++++++++
 5 files changed, 44 insertions(+)

diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java
index 377c6226..51a39bc9 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java
@@ -92,6 +92,21 @@ public class UserEOController extends BaseController<UserEO> {
         return Result.success(userVO);
     }
 
+    @ApiOperation(value = "|UserEO|详情接口包含被禁用用户")
+    @GetMapping("/getByIdWithDisabled")
+    public ResponseMessage<UserVO> getByIdFeignClientWithDisabled(String id) throws Exception {
+        UserEO userEO = userEOService.getUserWithRolesWithDisabled(id);
+        UserVO userVO= new UserVO();
+        if(userEO!=null){
+            userVO = BeanUtil.toBean(userEO,UserVO.class);
+            userVO.setRoles(userEO.getRoleEOList());
+            userVO.setOrgsstr(userEO.getOrgIdList());
+            userVO.setOrgs(userEO.getOrgEOList());
+            userVO.setPassword(userEO.getPassword());
+        }
+        return Result.success(userVO);
+    }
+
     /**
      * @return com.adc.da.util.http.ResponseMessage<com.adc.da.util.http.PageInfo                                                                                                                                                                                                                                                               <                                                                                                                                                                                                                                                               com.adc.da.sys.entity.UserEO>>
      * @Author liwenxuan
diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/dao/UserEODao.java b/adc-da-sys/src/main/java/com/adc/da/sys/dao/UserEODao.java
index e2e8a56f..3d07f90e 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/dao/UserEODao.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/dao/UserEODao.java
@@ -96,6 +96,11 @@ public interface UserEODao extends BaseMapper<UserEO> {
 	 */
 	public UserEO getUserWithRoles(String id);
 
+	/**
+	 * 查询用户及用户所对应的角色包含已禁用的用户
+	 */
+	public UserEO getUserWithRolesWithDisabled(String id);
+
 	public UserEO getUserWithRolesAll(String id);
 
 	public UserEO get(String id);
diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserEOService.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserEOService.java
index 133c493e..fa8f0f80 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserEOService.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserEOService.java
@@ -30,6 +30,8 @@ public interface IUserEOService extends IService<UserEO> {
 
     public UserEO getUserWithRoles(String id);
 
+    public UserEO getUserWithRolesWithDisabled(String id);
+
     public UserEO getUserWithRolesAll(String id);
 
     public int saveUserRole(UserEO userEO);
diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserEOServiceImpl.java
index e6cb41ea..2c3ba906 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserEOServiceImpl.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserEOServiceImpl.java
@@ -248,6 +248,16 @@ public class UserEOServiceImpl extends ServiceImpl<UserEODao, UserEO> implements
 		return this.baseMapper.getUserWithRoles(id);
 	}
 
+	/**
+	 * 查询用户及用户所对应的角色，包含已禁用用户
+	 * @param id
+	 * @return
+	 */
+	@Transactional(readOnly = true, rollbackFor = Exception.class)
+	public UserEO getUserWithRolesWithDisabled(String id) {
+		return this.baseMapper.getUserWithRolesWithDisabled(id);
+	}
+
 	@Transactional(readOnly = true, rollbackFor = Exception.class)
 	public UserEO getUserWithRolesAll(String id) {
 		return this.baseMapper.getUserWithRolesAll(id);
diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml
index 256369c5..0e9ed209 100644
--- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml
+++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml
@@ -427,6 +427,18 @@
         where u.usid = #{id}  and u.DISABLE_FLAG = '0'
     </select>
 
+    <!-- 根据用户ID获取用户信息及角色、组织机构信息，包含已禁用的用户 -->
+    <select id="getUserWithRolesWithDisabled" resultMap="UserRoleMap" parameterType="java.lang.String">
+        select
+        <include refid="User_Role_List"/>
+        from TS_USER u
+        left join TS_USER_ROLE ur on u.usid = ur.user_id
+        left join TS_ROLE r on ur.role_id = r.id
+        left join TS_USER_ORG UORG on u.usid = UORG.user_id
+        left join TS_ORG ORG on UORG.org_id = ORG.id
+        where u.usid = #{id}
+    </select>
+
     <select id="getUserWithRolesAll" resultMap="UserRoleMap" parameterType="java.lang.String">
         select
         <include refid="User_Role_List"/>