From 0c1c30026c906f8055b5f0315785175726f9202c Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期四, 20 六月 2024 13:38:42 +0800
Subject: [PATCH] 模块名称修改

---
 pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml
index 66b8221..6062cef 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml
@@ -21,6 +21,7 @@
     <result property="phone" column="phone"/>
     <result property="password" column="password"/>
     <result property="disabled" column="disabled" typeHandler="com.dy.common.mybatis.BooleanTypeHandler" />
+    <result column="create_dt" property="dt" />
   </resultMap>
   <resultMap id="oneResultMap" type="com.dy.pmsGlobal.pojoBa.BaUser" extends="BaseResultMap">
     <collection property="roles" fetchType="eager" column="{userId=id}" select="com.dy.pmsGlobal.daoBa.BaRoleMapper.selectByUserId" />
@@ -46,6 +47,9 @@
     id, name, phone, supper_admin
   </sql>
 
+  <select id="selectNameByUserId" parameterType="java.lang.Long" resultType="java.lang.String">
+    select name from ba_user where id=#{id}
+  </select>
   <select id="selectCount" resultType="java.lang.Long">
     select
       count(*)
@@ -72,7 +76,7 @@
     select
     count(*)
     from ba_user bu
-    inner join ba_user_role ur on ur.user_id=bu.id
+#     left join ba_user_role ur on ur.user_id=bu.id
     where bu.supper_admin!=1 and bu.deleted!=1
     <trim prefix="and" suffixOverrides="and">
       <if test="name != null and name != ''">
@@ -81,8 +85,11 @@
       <if test="phone != null and phone !=''">
         bu.phone = #{phone,jdbcType=VARCHAR} and
       </if>
-      <if test="roleId != null">
-        ur.role_id=#{roleId,jdbcType=BIGINT}
+<!--      <if test="roleId != null">-->
+<!--        ur.role_id=#{roleId,jdbcType=BIGINT} and-->
+<!--      </if>-->
+      <if test="disabled != null">
+        bu.disabled=#{disabled,jdbcType=BOOLEAN}
       </if>
     </trim>
   </select>
@@ -92,7 +99,7 @@
       <property name="alias" value="bu"/>
     </include>
     from ba_user bu
-    inner join ba_user_role ur on ur.user_id=bu.id
+#     left join ba_user_role ur on ur.user_id=bu.id
     where bu.supper_admin!=1 and bu.deleted!=1
     <trim prefix="and" suffixOverrides="and">
       <if test="name != null and name != ''">
@@ -101,9 +108,9 @@
       <if test="phone != null and phone !=''">
         bu.phone = #{phone,jdbcType=VARCHAR} and
       </if>
-      <if test="roleId != null">
-        ur.role_id=#{roleId,jdbcType=BIGINT} and
-      </if>
+<!--      <if test="roleId != null">-->
+<!--        ur.role_id=#{roleId,jdbcType=BIGINT} and-->
+<!--      </if>-->
       <if test="disabled != null">
         bu.disabled=#{disabled,jdbcType=BOOLEAN}
       </if>

--
Gitblit v1.8.0