[修改] 组织管理 删除id 用org_code

adc-da-sys/target/classes/mybatis/mapper/sys/mysql/OrgEOMapper.xml

@@ -4,11 +4,11 @@
 
     <!-- 查询条件 -->
     <sql id="Base_Where_Clause">
-        <if test="pageVO.id != null and pageVO.id !=''">
-            and id = #{pageVO.id}
+        <if test="pageVO.orgCode != null and pageVO.orgCode !=''">
+            and org_code = #{pageVO.orgCode}
         </if>
-        <if test="pageVO.orgCode != null and pageVO.orgCode != ''">
-            and ORG_CODE =  #{pageVO.orgCode}
+        <if test="pageVO.UUID != null and pageVO.UUID != ''">
+            and UUID =  #{pageVO.UUID}
         </if>
         <if test="pageVO.orgName != null and pageVO.orgName != ''">
             and ORG_NAME LIKE CONCAT(CONCAT('%',#{pageVO.orgName}) ,'%')
@@ -45,4 +45,15 @@
             <include refid="Base_Where_Clause"/>
         </where>
     </select>
+    <select id="selectCountByUUID" resultType="java.lang.Long">
+        select count(1) from   TS_ORG
+        <where>
+            <if test="pageVO.UUID != null and pageVO.UUID != ''">
+                and UUID != #{pageVO.UUID}
+            </if>
+            <if test="pageVO.orgCode != null and pageVO.orgCode != ''">
+                and org_code =  #{pageVO.orgCode}
+            </if>
+        </where>
+    </select>
 </mapper>

adc-da-sys/target/classes/mybatis/mapper/sys/mysql/UserEOMapper.xml

@@ -58,7 +58,7 @@
             <result column="remarks" property="remarks"/>
         </collection>
         <collection property="orgList" ofType="com.adc.da.sys.entity.OrgEO">
-            <id column="id" property="id"/>
+            <id column="id" property="orgCode"/>
             <result column="org_name" property="orgName"/>
         </collection>
     </resultMap>
@@ -103,13 +103,13 @@
             r.is_default as isDefault,
             r.name as name,
             r.remarks as remarks,
-            org.id as orgId,
+            org.org_code as orgId,
             org.org_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.id and org.status = 1
+        left join TS_org org on uo.org_id = org.org_code and org.status = 1
         where u.usid = #{id}
     </select>
 
@@ -160,7 +160,7 @@
             r.del_flag as r_delFlag,
             r.is_default as r_is_default,
             r.name as r_name,
-            o.id as o_id,
+            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,
@@ -169,7 +169,7 @@
         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.id
+        left join TS_ORG o on uo.org_id = o.org_code
         where users.del_flag != 1
         and users.usid in
         <foreach collection="userIdList" item="id" open="(" separator="," close=")">
@@ -186,7 +186,7 @@
             r.del_flag as r_delFlag,
             r.is_default as r_is_default,
             r.name as r_name,
-            o.id as o_id,
+            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,
@@ -195,7 +195,7 @@
                  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.id
+                 left join TS_ORG o on uo.org_id = o.org_code
         where users.del_flag != 1
         and  users.usid=#{usid}
     </select>
@@ -209,7 +209,7 @@
             r.del_flag as r_delFlag,
             r.is_default as r_is_default,
             r.name as r_name,
-            o.id as o_id,
+            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,
@@ -218,7 +218,7 @@
                  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.id
+                 left join TS_ORG o on uo.org_id = o.org_code
         where  users.usid=#{usid}
     </select>
 
@@ -233,7 +233,7 @@
         r.del_flag as r_delFlag,
         r.is_default as r_is_default,
         r.name as r_name,
-        o.id as o_id,
+        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,
@@ -242,7 +242,7 @@
         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.id
+        left join TS_ORG o on uo.org_id = o.org_code
         where users.usid in
         <foreach collection="userIdList" item="id" open="(" separator="," close=")">
             #{id}