From 115a8ae8b7f54730e5b40aacc9e7ce04537e4d0f Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Mon, 21 Dec 2020 22:54:54 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90system=E3=80=91=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9F=A5=E8=AF=A2=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/mapper/mapping/SysUserMapper.xml     | 33 ++++++++++++-------
 .../user/pojo/response/SysUserResponse.java   |  6 ++--
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserMapper.xml b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserMapper.xml
index d6acea942..7aa78a465 100644
--- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserMapper.xml
+++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserMapper.xml
@@ -4,14 +4,25 @@
 
     <!--获取用户分页列表-->
     <select id="findUserPage" resultType="cn.stylefeng.roses.kernel.system.modular.user.pojo.response.SysUserResponse">
-        select sys_user.*,
-        sys_employee.employeeNo,
-        sys_employee.organization_id,
-        from sys_user
-        left join sys_employee on sys_user.id = sys_employee.user_id
+        select
+        suser.user_id as userId,
+        suser.account as account,
+        suser.nick_name as nickName,
+        suser.real_name as realName,
+        suser.avatar as avatar,
+        suser.birthday as birthday,
+        suser.sex as sex,
+        suser.email as email,
+        suser.phone as phone,
+        suser.tel as tel,
+        suser.status_flag as statusFlag,
+        suorg.org_id as orgId,
+        suorg.position_id as positionId
+        from sys_user suser
+        left join sys_user_org suorg on suser.user_id = suorg.user_id
         <where>
-            <if test="sysUserRequest.name != null and sysUserRequest.name != ''">
-                and sys_user.name like concat('%',#{sysUserRequest.name},'%')
+            <if test="sysUserRequest.realName != null and sysUserRequest.realName != ''">
+                and sys_user.real_name like concat('%',#{sysUserRequest.realName},'%')
             </if>
             <if test="sysUserRequest.account != null and sysUserRequest.account != ''">
                 and sys_user.account like concat('%',#{sysUserRequest.account},'%')
@@ -19,11 +30,11 @@
             <if test="sysUserRequest.statusFlag != null and sysUserRequest.statusFlag != ''">
                 and sys_user.status_flag like concat('%',#{sysUserRequest.statusFlag},'%')
             </if>
-            <if test="sysUserRequest.organizationId != null and sysUserRequest.organizationId != ''">
-                and sys_user.organization_id like concat('%',#{sysUserRequest.organizationId},'%')
+            <if test="sysUserRequest.orgId != null and sysUserRequest.orgId != ''">
+                and suorg.org_id = #{sysUserRequest.orgId}
             </if>
-            and sys_user.del_flag = 'N'
-            order by create_time desc
+            and suser.del_flag = 'N'
+            order by suser.create_time desc
         </where>
 
     </select>
diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/pojo/response/SysUserResponse.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/pojo/response/SysUserResponse.java
index 9b657584d..8403d336e 100644
--- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/pojo/response/SysUserResponse.java
+++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/pojo/response/SysUserResponse.java
@@ -17,7 +17,7 @@ public class SysUserResponse {
     /**
      * 主键
      */
-    private Long id;
+    private Long userId;
 
     /**
      * 账号
@@ -32,7 +32,7 @@ public class SysUserResponse {
     /**
      * 姓名
      */
-    private String name;
+    private String realName;
 
     /**
      * 头像
@@ -46,7 +46,7 @@ public class SysUserResponse {
     private Date birthday;
 
     /**
-     * 性别(字典 1男 2女 3未知)
+     * 性别（M-男，F-女）
      */
     private String sex;