From 28fb15382ef9826e0f1537f034fe9c67654d873a Mon Sep 17 00:00:00 2001
From: bupengxiang <bupengxiang@syxysoft.com>
Date: Tue, 16 May 2023 18:12:23 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20UserEOMapper.xml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/mapper/sys/mysql/UserEOMapper.xml | 69 +++++++++----------
 1 file changed, 34 insertions(+), 35 deletions(-)

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 295a31a..434be5a 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
@@ -6,7 +6,7 @@
         select * from(select t1.USID,t1.ACCOUNT,t1.USNAME,t1.CELLPHONE_NUMBER,t1.EMAIL,t3.NAME ROLENAME,t3.id ROLEID,
         date_format(t1.UPDATE_TIME,'%Y-%m-%d %H:%i:%S')CREATEDATE,
         GROUP_CONCAT( DISTINCT org.ID ) as ORGID,
-        GROUP_CONCAT( DISTINCT org.org_name )as ORGNAME
+        GROUP_CONCAT( DISTINCT org.LONG_NAME )as ORGNAME
         from TS_USER t1
         left join TR_USER_ROLE t2 on t1.USID=t2.USER_ID
         left JOIN TS_ROLE t3 on t2.ROLE_ID=t3.ID
@@ -48,7 +48,6 @@
         <result column="CELLPHONE_NUMBER" property="cellPhoneNumber"/>
         <result column="EMAIL" property="email"/>
         <result column="CREATE_TIME" property="createTime"/>
-<!--        <result column="ORG_Name" property="orgName"/>-->
     </resultMap>
 
     <resultMap id="UserRoleMap" extends="BaseResultMap" type="com.adc.da.sys.entity.UserEO">
@@ -66,8 +65,8 @@
             <result column="remarks" property="remarks"/>
         </collection>
         <collection property="orgEOList" ofType="com.adc.da.sys.entity.OrgEO">
-            <id column="orgId" property="orgCode"/>
-            <result column="org_name" property="orgName"/>
+            <id column="orgId" property="DepartmentCode"/>
+            <result column="org_name" property="LongName"/>
         </collection>
     </resultMap>
 
@@ -85,10 +84,10 @@
         </collection>
         <collection property="orgEOList" ofType="com.adc.da.sys.entity.OrgEO" javaType="list">
             <id column="o_id" property="id"/>
-            <result column="o_org_code" property="orgCode"/>
-            <result column="o_org_name" property="orgName"/>
-            <result column="o_sup_org_code" property="supOrgCode"/>
-            <result column="o_bmdm14" property="bmdm14"/>
+            <result column="DEPARTMENT_CODE" property="DepartmentCode"/>
+            <result column="LONG_NAME" property="LongName"/>
+            <result column="PARENT_ID" property="ParentID"/>
+            <result column="BMDM14" property="BMDM14"/>
         </collection>
     </resultMap>
 
@@ -111,13 +110,13 @@
             r.is_default as isDefault,
             r.name as name,
             r.remarks as remarks,
-            org.org_code as orgId,
-            org.org_name
+            org.DEPARTMENT_CODE as DEPARTMENT_CODE,
+            org.LONG_NAME as LONG_NAME
         from TS_USER u
         left join TR_USER_ROLE ur on u.usid = ur.user_id
         left join TS_ROLE r on ur.role_id = r.id
         left join TR_USER_org uo on u.usid = uo.user_id
-        left join TS_org org on uo.org_id = org.org_code and org.status = 1
+        left join TS_org org on uo.org_id = org.DEPARTMENT_CODE
         where u.usid = #{id}
     </select>
 
@@ -168,16 +167,16 @@
             r.del_flag as r_delFlag,
             r.is_default as r_is_default,
             r.name as r_name,
-            o.org_code as o_id,
-            o.org_code as o_org_code,
-            o.org_name as o_org_name,
-            o.sup_org_code as o_sup_org_code,
-            o.bmdm_14 as o_bmdm14
+            o.id as o_id,
+            o.DEPARTMENT_CODE as DEPARTMENT_CODE,
+            o.LONG_NAME as LONG_NAME,
+            o.PARENT_ID as PARENT_ID,
+            o.BMDM_14 as BMDM_14
         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 TR_USER_ORG uo on users.usid = uo.user_id
-        left join TS_ORG o on uo.org_id = o.org_code
+        left join TS_ORG o on uo.org_id = o.id
         where users.del_flag != 1
         and users.usid in
         <foreach collection="userIdList" item="id" open="(" separator="," close=")">
@@ -194,16 +193,16 @@
             r.del_flag as r_delFlag,
             r.is_default as r_is_default,
             r.name as r_name,
-            o.org_code as o_id,
-            o.org_code as o_org_code,
-            o.org_name as o_org_name,
-            o.sup_org_code as o_sup_org_code,
-            o.bmdm_14 as o_bmdm14
+            o.id as o_id,
+            o.DEPARTMENT_CODE as DEPARTMENT_CODE,
+            o.LONG_NAME as LONG_NAME,
+            o.PARENT_ID as PARENT_ID,
+            o.BMDM_14 as BMDM_14
         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 and  r.del_flag = 0
                  left join TR_USER_ORG uo on users.usid = uo.user_id
-                 left join TS_ORG o on uo.org_id = o.org_code and o.status = 1
+                 left join TS_ORG o on uo.org_id = o.id
         where users.del_flag != 1
         and  users.usid=#{usid}
     </select>
@@ -217,16 +216,16 @@
             r.del_flag as r_delFlag,
             r.is_default as r_is_default,
             r.name as r_name,
-            o.org_code as o_id,
-            o.org_code as o_org_code,
-            o.org_name as o_org_name,
-            o.sup_org_code as o_sup_org_code,
-            o.bmdm_14 as o_bmdm14
+            o.id as o_id,
+            o.DEPARTMENT_CODE as DEPARTMENT_CODE,
+            o.LONG_NAME as LONG_NAME,
+            o.PARENT_ID as PARENT_ID,
+            o.BMDM_14 as BMDM_14
         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 TR_USER_ORG uo on users.usid = uo.user_id
-                 left join TS_ORG o on uo.org_id = o.org_code
+                 left join TS_ORG o on uo.org_id = o.id
         where  users.usid=#{usid}
     </select>
 
@@ -241,16 +240,16 @@
         r.del_flag as r_delFlag,
         r.is_default as r_is_default,
         r.name as r_name,
-        o.org_code as o_id,
-        o.org_code as o_org_code,
-        o.org_name as o_org_name,
-        o.sup_org_code as o_sup_org_code,
-        o.bmdm_14 as o_bmdm14
+        o.id as o_id,
+        o.DEPARTMENT_CODE as DEPARTMENT_CODE,
+        o.LONG_NAME as LONG_NAME,
+        o.PARENT_ID as PARENT_ID,
+        o.BMDM_14 as BMDM_14
         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 TR_USER_ORG uo on users.usid = uo.user_id
-        left join TS_ORG o on uo.org_id = o.org_code
+        left join TS_ORG o on uo.org_id = o.id
         where users.usid in
         <foreach collection="userIdList" item="id" open="(" separator="," close=")">
             #{id}