From ab18d499c2de9a812fe3fcb531f2a6059c972b6c Mon Sep 17 00:00:00 2001
From: "xuetao.li" <lxtalx@gmail.com>
Date: Wed, 19 Apr 2023 18:07:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AEid=E8=8E=B7=E5=8F=96=E5=A4=9A?=
 =?UTF-8?q?=E4=B8=AA=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E7=9A=84=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/adc/da/sys/dao/mysql/UserEODao.java  |  2 +-
 .../src/main/java/com/adc/da/sys/entity/OrgEO.java     |  2 +-
 .../src/main/java/com/adc/da/sys/entity/RoleEO.java    |  1 -
 .../java/com/adc/da/sys/service/RoleEOService.java     |  2 +-
 adc-da-sys/src/main/java/com/adc/da/sys/vo/UserVO.java |  2 +-
 .../mybatis/mapper/sys/mysql/UserEOMapper.xml          | 10 +++++-----
 6 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/UserEODao.java b/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/UserEODao.java
index f25d1f2..c9932ad 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/UserEODao.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/UserEODao.java
@@ -31,7 +31,7 @@ public interface UserEODao extends BaseMapper<UserEO> {
      */
     UserEO getUserWithRoles(String id);
 
-    List<UserVO> getUserByIdList(List<String> userIdList);
+    List<UserVO> getUserByIdList(@Param("userIdList") List<String> userIdList);
 
     // 根据account获取未逻辑删除的UserEO
     UserEO getUserEOByAccountNotDeleted(String account);
diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/entity/OrgEO.java b/adc-da-sys/src/main/java/com/adc/da/sys/entity/OrgEO.java
index ae2a567..6ba7ccd 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/entity/OrgEO.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/entity/OrgEO.java
@@ -60,7 +60,7 @@ public class OrgEO extends BaseEntity implements Serializable {
     /**
      * 部门14位码
      */
-    @TableField("BPMN_14")
+    @TableField("BMDM_14")
     private String bmdm14;
 
     /**
diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/entity/RoleEO.java b/adc-da-sys/src/main/java/com/adc/da/sys/entity/RoleEO.java
index 3516e5a..3265a97 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/entity/RoleEO.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/entity/RoleEO.java
@@ -23,7 +23,6 @@ import com.adc.da.base.entity.BaseEntity;
  *
  * @author comments created by Lee Kwanho
  * date 2018-08-17
- * @see com.adc.da.sys.controller.RoleEOController
  */
 public class RoleEO extends BaseEntity implements Serializable {
 
diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/RoleEOService.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/RoleEOService.java
index 3dfb3bc..5413e91 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/service/RoleEOService.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/RoleEOService.java
@@ -25,7 +25,7 @@ import com.adc.da.util.utils.UUID;
  *
  * @author comments created by Lee Kwanho
  * @see RoleEODao
- * @see com.adc.da.sys.controller.RoleEOController
+ * @see com.adc.da.sys.service.RoleEOService
  */
 @Service("roleEOService")
 @Transactional
diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/vo/UserVO.java b/adc-da-sys/src/main/java/com/adc/da/sys/vo/UserVO.java
index c1d4c69..09fa544 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/vo/UserVO.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/vo/UserVO.java
@@ -50,6 +50,6 @@ public class UserVO {
     /**
      * 部门列表
      */
-    private List<OrgEO> orgList = new ArrayList();
+    private List<OrgEO> orgEOList = new ArrayList();
 
 }
diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml
index 04bffb8..c2a032e 100644
--- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml
+++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml
@@ -60,7 +60,7 @@
     </resultMap>
 
 <!--    包含用户基本数据，角色数据，组织机构数据等-->
-    <resultMap id="UserDetailMap" extends="BaseResultMap" type="com.adc.da.sys.entity.UserEO">
+    <resultMap id="UserDetailMap" extends="BaseResultMap" type="com.adc.da.sys.vo.UserVO">
         <result column="usid" property="usid"></result>
         <result column="usname" property="usname"></result>
         <result column="account" property="account"></result>
@@ -141,7 +141,7 @@
         select
             users.usid,
             users.usname,
-            users.account
+            users.account,
             r.id as r_id,
             r.data_scope as r_data_scope,
             r.del_flag as r_delFlag,
@@ -151,13 +151,13 @@
             o.org_code as o_org_code,
             o.org_name as o_org_name,
             o.sup_org_code as o_sup_org_code,
-            o.bmdm14 as o_bmdm14
+            o.bmdm_14 as o_bmdm14
         from TS_USER users
         left join TR_USER_ROLE ur on users.usid = ur.user_id
         left join TS_ROLE r on ur.role_id = r.id
-        left join TS_USER_ORG uo on users.usid = uo.user_id
+        left join TR_USER_ORG uo on users.usid = uo.user_id
         left join TS_ORG o on uo.org_id = o.id
-        where del_flag != 1
+        where users.del_flag != 1
         and users.usid in
         <foreach collection="userIdList" item="id" open="(" separator="," close=")">
             #{id}