From cf25cda454a645ea47ce6135184c3df6afd09ddc Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期六, 20 一月 2024 10:40:41 +0800
Subject: [PATCH] 2024-01-20 朱宝民 删除不存在用户提示信息,用户名字段改名,Long型字段转字符串

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml |  141 ++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 127 insertions(+), 14 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
index 4aa5498..9cc43ba 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
@@ -8,7 +8,7 @@
         <!--@Table ba_user-->
         <id property="id" column="id" />
         <result property="blockId" column="blockId"/>
-        <result property="name" column="name"/>
+        <result property="userName" column="name"/>
         <result property="phone" column="phone"/>
         <result property="password" column="password"/>
         <result property="orgTag" column="orgTag"/>
@@ -21,7 +21,7 @@
         <!--@mbg.generated-->
         <!--@Table ba_user-->
         <id property="id" column="id" />
-        <result property="name" column="name"/>
+        <result property="userName" column="name"/>
         <result property="phone" column="phone"/>
         <result property="orgTag" column="orgTag"/>
         <result property="supperAdmin" column="supperAdmin"/>
@@ -31,7 +31,7 @@
     <resultMap id="loginResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaUser">
         <id property="id" column="id" />
         <result property="blockId" column="blockId"/>
-        <result property="name" column="name"/>
+        <result property="userName" column="name"/>
         <result property="phone" column="phone"/>
         <result property="orgTag" column="orgTag"/>
         <result property="supperAdmin" column="supperAdmin"/>
@@ -66,10 +66,10 @@
         from ba_user
         where supperAdmin!=1 and deleted!=1
         <trim prefix="and" suffixOverrides="and">
-            <if test="name != null">
+            <if test="name != null and name != ''">
                 name like concat('%', #{name}, '%') and
             </if>
-            <if test="phone != null">
+            <if test="phone != null and phone !=''">
                 phone = #{phone,jdbcType=VARCHAR}
             </if>
         </trim>
@@ -84,10 +84,10 @@
         left join ba_block bb on bu.blockId = bb.id
         where bu.supperAdmin!=1 and bu.deleted!=1
         <trim prefix="and" suffixOverrides="and">
-            <if test="name != null">
+            <if test="name != null and name != ''">
                 bu.name like concat('%', #{name}, '%') and
             </if>
-            <if test="phone != null">
+            <if test="phone != null and phone !=''">
                 bu.phone = #{phone,jdbcType=VARCHAR}
             </if>
         </trim>
@@ -102,7 +102,7 @@
         insert into ba_user (<include refid="Base_Column_List" />)
         values (#{id,jdbcType=BIGINT},
         #{blockId,jdbcType=BIGINT},
-        #{name,jdbcType=VARCHAR},
+        #{userName,jdbcType=VARCHAR},
         #{phone,jdbcType=VARCHAR},
         #{password,jdbcType=VARCHAR},
         #{orgTag,jdbcType=VARCHAR},
@@ -120,7 +120,7 @@
             <if test="blockId != null">
                 blockId,
             </if>
-           <if test="name != null">
+           <if test="userName != null">
                 `name`,
             </if>
             <if test="phone != null">
@@ -149,8 +149,8 @@
             <if test="blockId != null">
                 #{blockId,jdbcType=BIGINT},
             </if>
-           <if test="name != null">
-                #{name,jdbcType=VARCHAR},
+           <if test="userName != null">
+                #{userName,jdbcType=VARCHAR},
             </if>
             <if test="phone != null">
                 #{phone,jdbcType=VARCHAR},
@@ -179,8 +179,8 @@
             <if test="blockId != null">
                 blockId = #{blockId,jdbcType=BIGINT},
             </if>
-           <if test="name != null">
-                `name` = #{name,jdbcType=VARCHAR},
+           <if test="userName != null">
+                `name` = #{userName,jdbcType=VARCHAR},
             </if>
             <if test="phone != null">
                 phone = #{phone,jdbcType=VARCHAR},
@@ -200,7 +200,7 @@
     <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoBa.BaUser">
         update ba_user
         set blockId = #{blockId,jdbcType=BIGINT},
-        `name` = #{name,jdbcType=VARCHAR},
+        `name` = #{userName,jdbcType=VARCHAR},
         phone = #{phone,jdbcType=VARCHAR},
         password = #{password,jdbcType=VARCHAR},
         disabled = #{disabled,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
@@ -221,4 +221,117 @@
         update ba_user set deleted = 1
         where id = #{id,jdbcType=BIGINT}
     </delete>
+
+    <!--鏍规嵁鐢ㄦ埛缂栧彿鑾峰彇鐢ㄦ埛淇℃伅-->
+    <!--2024-01-09 搴熷純-->
+    <select id="getUserInfos" resultType="com.dy.pipIrrGlobal.voBa.VoUserInfo">
+        SELECT
+            user.id AS userId,
+            user.`name` AS userName,
+            rol.id AS roleId,
+            rol.`name` AS roleName,
+            per.permissions
+        FROM ba_user user
+            INNER JOIN ba_user_role use_rol ON user.id = use_rol.userId
+            INNER JOIN ba_role rol ON rol.id = use_rol.roleId
+            INNER JOIN ba_role_permissions per ON per.roleId = rol.id
+        <where>
+            <if test = "userId != null and userId > 0">
+                AND user.id = ${userId}
+            </if>
+        </where>
+    </select>
+
+    <!--鏍规嵁鐢ㄦ埛缂栧彿鑾峰彇鐢ㄦ埛淇℃伅-->
+    <select id="getUserInfoById" resultType="java.util.Map">
+        SELECT
+            id AS userId,
+            name AS userName
+        FROM ba_user
+        <where>
+            AND disabled = 0
+            AND deleted = 0
+            <if test = "userId != null and userId > 0">
+                AND ba_user.id = ${userId}
+            </if>
+        </where>
+    </select>
+
+    <!--鏍规嵁鎸囧畾鐨勬潯浠惰幏鍙栫敤鎴疯褰曟暟-->
+    <select id="getRecordCount" parameterType="java.util.Map" resultType="java.lang.Long">
+        SELECT
+            COUNT(*) AS recordCount
+        FROM ba_user user
+            INNER JOIN ba_user_role usro ON usro.userId = user.id
+        <where>
+            AND user.supperAdmin != 1
+            AND user.deleted = 0
+
+            <if test = "name != null and name !=''">
+                AND user.name like CONCAT('%',#{name},'%')
+            </if>
+
+            <if test = "phone != null and phone !=''">
+                AND user.phone like CONCAT('%',#{phone},'%')
+            </if>
+
+            <if test = "roleId != null and roleId > 0">
+                AND usro.roleId = ${roleId}
+            </if>
+        </where>
+    </select>
+
+    <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇鐢ㄦ埛鍒楄〃-->
+    <select id="getUsers" resultType="com.dy.pipIrrGlobal.voBa.VoUserInfo">
+        SELECT
+            CAST(id AS char) AS userId,
+            phone,
+            name AS userName,
+            disabled AS stateId,
+            (CASE
+                 WHEN disabled = 0 THEN "姝e父"
+                 WHEN disabled = 1 THEN "宸茬鐢�"
+                END) AS stateName,
+            CAST(blockId AS char) AS blockId,
+            (SELECT name FROM ba_block WHERE id = user.blockId) AS blockName
+        FROM ba_user user
+            INNER JOIN ba_user_role usro ON usro.userId = user.id
+        <where>
+            AND user.supperAdmin != 1
+            AND user.deleted = 0
+
+            <if test = "name != null and name !=''">
+                AND user.name like CONCAT('%',#{name},'%')
+            </if>
+
+            <if test = "phone != null and phone !=''">
+                AND user.phone like CONCAT('%',#{phone},'%')
+            </if>
+
+            <if test = "roleId != null and roleId > 0">
+                AND usro.roleId = ${roleId}
+            </if>
+        </where>
+        ORDER BY user.id DESC
+        <if test="pageCurr != null and pageSize != null">
+            LIMIT ${pageCurr}, ${pageSize}
+        </if>
+    </select>
+
+    <!--鏍规嵁鐢ㄦ埛缂栧彿鑾峰彇瑙掕壊ID鍒楄〃-->
+    <select id="getRoleIdsByUserId" resultType="java.util.HashMap">
+        SELECT
+            roleId
+        FROM ba_user_role
+        WHERE userId = ${userId}
+    </select>
+
+    <select id="getRoleNamesByUserId" resultType="java.util.HashMap">
+        SELECT
+            ro.name AS roleName
+        FROM ba_user_role usro
+                 INNER JOIN ba_role ro ON usro.roleId = ro.id
+        WHERE userId = ${userId}
+
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0