From 4d84802f381a447171c5dda28d44a0e53e93f3f4 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 13 十二月 2024 17:09:05 +0800
Subject: [PATCH] 后台设置、小票机管理、员工管理,系统管理,售后管理

---
 manage/src/main/resources/mapping/SecUserMapper.xml |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/manage/src/main/resources/mapping/SecUserMapper.xml b/manage/src/main/resources/mapping/SecUserMapper.xml
index d341d4d..d2c2927 100644
--- a/manage/src/main/resources/mapping/SecUserMapper.xml
+++ b/manage/src/main/resources/mapping/SecUserMapper.xml
@@ -29,6 +29,7 @@
         <result column="provinceCode" property="provinceCode"/>
         <result column="cityCode" property="cityCode"/>
         <result column="areaCode" property="areaCode"/>
+        <result column="pictures" property="pictures"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -41,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,storeId
+            provinceCode, cityCode, areaCode,storeId,pictures
     </sql>
 
     <sql id="Base_Column_List_Other">
@@ -52,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">
@@ -70,27 +71,26 @@
         su.state,
         su.roleType,
         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
         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
         <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.isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
         </where>
         ORDER BY su.createTime DESC

--
Gitblit v1.7.1