From 50d06fac81b2125292449a2eb29eba7e3f933b31 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 03 九月 2025 18:51:28 +0800
Subject: [PATCH] 修改
---
manage/src/main/resources/mapping/SecUserMapper.xml | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/manage/src/main/resources/mapping/SecUserMapper.xml b/manage/src/main/resources/mapping/SecUserMapper.xml
index 634b301..756091c 100644
--- a/manage/src/main/resources/mapping/SecUserMapper.xml
+++ b/manage/src/main/resources/mapping/SecUserMapper.xml
@@ -25,9 +25,11 @@
<result column="gender" property="gender"/>
<result column="deptId" property="deptId"/>
<result column="userType" property="userType"/>
+ <result column="storeId" property="storeId"/>
<result column="provinceCode" property="provinceCode"/>
<result column="cityCode" property="cityCode"/>
<result column="areaCode" property="areaCode"/>
+ <result column="pictures" property="pictures"/>
</resultMap>
<!-- 通用查询结果列 -->
@@ -40,7 +42,7 @@
isDelete,
id, account, description, password, phone, `state`, last_login_time AS lastLoginTime,
nick_name AS nickName, avatar_url AS avatarUrl, province, city, area, address, birthday, gender,deptId,userType,
- provinceCode, cityCode, areaCode
+ provinceCode, cityCode, areaCode,storeId,pictures
</sql>
<sql id="Base_Column_List_Other">
@@ -51,7 +53,7 @@
su.isDelete,
su.id, su.account, su.description, su.password, su.phone, su.`state`, su.last_login_time AS lastLoginTime,
su.nick_name AS nickName, su.avatar_url AS avatarUrl, su.province, su.city, su.area, su.address, su.birthday, su.gender,su.deptId,su.userType,
- su.provinceCode, su.cityCode, su.areaCode
+ su.provinceCode, su.cityCode, su.areaCode,su.pictures
</sql>
<select id="getSecUserList" resultType="com.jilongda.manage.authority.vo.SecUsersVO">
@@ -67,29 +69,31 @@
su.`password`,
su.phone,
su.state,
- su.roleType,
+ su.userType,
su.last_login_time AS lastLoginTime, su.nick_name AS nickName, su.avatar_url AS avatarUrl, su.province, su.city, su.area, su.address,
- su.birthday, su.gender,sr.id AS roleId,sr.rolename AS rolename,su.deptId,su.userType,su.provinceCode, su.cityCode, su.areaCode,td.deptName
+ su.birthday, su.gender,sr.id AS roleId,sr.rolename AS rolename,su.deptId,su.userType,su.provinceCode, su.cityCode, su.areaCode,su.pictures,
+ s.name AS storeName
FROM sec_user su
LEFT JOIN sec_user_role sur ON su.id = sur.user_id
LEFT JOIN sec_role sr ON sur.role_id = sr.id
- LEFT JOIN t_dept td ON su.deptId = td.id
+ LEFT JOIN t_store s ON su.storeId = s.id
<where>
- <if test="dto.account != null and dto.account != ''">
- AND su.account LIKE concat('%', #{dto.account,jdbcType=VARCHAR}, '%')
- </if>
<if test="dto.nickName != null and dto.nickName != ''">
AND su.nick_name LIKE concat('%', #{dto.nickName,jdbcType=VARCHAR}, '%')
</if>
<if test="dto.phone != null and dto.phone != ''">
AND su.phone LIKE concat('%', #{dto.phone,jdbcType=VARCHAR}, '%')
</if>
- <if test="dto.rolename != null and dto.rolename != ''">
- AND sr.rolename LIKE concat('%', #{dto.rolename,jdbcType=VARCHAR}, '%')
- </if>
<if test="dto.state != null">
AND su.state = #{dto.state}
</if>
+ <if test="dto.storeId != null">
+ AND su.storeId = #{dto.storeId}
+ </if>
+ <if test="dto.roleId != null">
+ AND sr.id = #{dto.roleId}
+ </if>
+ and su.id !=1
AND su.isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
</where>
ORDER BY su.createTime DESC
--
Gitblit v1.7.1