From 62a7f3228c94db41bf57858a6549eb0db033bf1e Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期三, 29 五月 2024 11:44:17 +0800
Subject: [PATCH] 2024-05-29 朱宝民
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml | 37 ++++++++++++++++++++++---------------
1 files changed, 22 insertions(+), 15 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 9cc43ba..88714b1 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
@@ -99,7 +99,8 @@
</trim>
</select>
<insert id="putin" parameterType="com.dy.pipIrrGlobal.pojoBa.BaUser">
- insert into ba_user (<include refid="Base_Column_List" />)
+<!-- insert into ba_user (<include refid="Base_Column_List" />)-->
+ insert into ba_user(id, blockId, name, phone, password, orgTag, supperAdmin, disabled, deleted)
values (#{id,jdbcType=BIGINT},
#{blockId,jdbcType=BIGINT},
#{userName,jdbcType=VARCHAR},
@@ -195,7 +196,7 @@
deleted = #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
</if>
</set>
- where id = #{id,jdbcType=BIGINT}
+ where id = #{id, jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoBa.BaUser">
update ba_user
@@ -245,14 +246,18 @@
<!--鏍规嵁鐢ㄦ埛缂栧彿鑾峰彇鐢ㄦ埛淇℃伅-->
<select id="getUserInfoById" resultType="java.util.Map">
SELECT
- id AS userId,
- name AS userName
- FROM ba_user
+ us.id AS userId,
+ us.name AS userName,
+ us.phone,
+ IFNULL(us.blockId, 0) AS blockId,
+ IFNULL(blo.name, 0) AS blockName
+ FROM ba_user us
+ LEFT JOIN ba_block blo ON us.blockId = blo.id
<where>
- AND disabled = 0
- AND deleted = 0
+ AND us.disabled = 0
+ AND us.deleted = 0
<if test = "userId != null and userId > 0">
- AND ba_user.id = ${userId}
+ AND us.id = ${userId}
</if>
</where>
</select>
@@ -267,8 +272,8 @@
AND user.supperAdmin != 1
AND user.deleted = 0
- <if test = "name != null and name !=''">
- AND user.name like CONCAT('%',#{name},'%')
+ <if test = "userName != null and userName !=''">
+ AND user.name like CONCAT('%',#{userName},'%')
</if>
<if test = "phone != null and phone !=''">
@@ -300,8 +305,8 @@
AND user.supperAdmin != 1
AND user.deleted = 0
- <if test = "name != null and name !=''">
- AND user.name like CONCAT('%',#{name},'%')
+ <if test = "userName != null and userName !=''">
+ AND user.name like CONCAT('%',#{userName},'%')
</if>
<if test = "phone != null and phone !=''">
@@ -313,9 +318,11 @@
</if>
</where>
ORDER BY user.id DESC
- <if test="pageCurr != null and pageSize != null">
- LIMIT ${pageCurr}, ${pageSize}
- </if>
+ <trim prefix="limit " >
+ <if test="start != null and count != null">
+ #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
+ </if>
+ </trim>
</select>
<!--鏍规嵁鐢ㄦ埛缂栧彿鑾峰彇瑙掕壊ID鍒楄〃-->
--
Gitblit v1.8.0