From a2e2c9d1f359e9702d59a4d27a36af3f0bb6aceb Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期五, 19 一月 2024 17:27:33 +0800
Subject: [PATCH] 2024-01-19 朱宝民 获取用户列表新接口
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml | 121 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 117 insertions(+), 4 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..c49501a 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
@@ -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>
@@ -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
+ id AS userId,
+ phone,
+ name AS userName,
+ disabled AS stateId,
+ (CASE
+ WHEN disabled = 0 THEN "姝ｅ父"
+ WHEN disabled = 1 THEN "宸茬鐢�"
+ END) AS stateName,
+ 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