From 1de25f41359fe2b44320280fdfde3c0b4a89a9ef Mon Sep 17 00:00:00 2001
From: fumeiai <fumeiai@linzikg.com>
Date: Tue, 26 May 2020 10:22:56 +0800
Subject: [PATCH] update sql

---
 .idea/workspace.xml                          | 14 +-------------
 src/main/resources/logback-spring.xml        |  2 +-
 src/main/resources/mapper/sys/SysUserDao.xml |  5 +++--
 target/classes/logback-spring.xml            |  2 +-
 target/classes/mapper/sys/SysUserDao.xml     |  5 +++--
 5 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b0561416..8fa76a63 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,21 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="e4baaf01-a2c2-445d-98a1-9f4c50c148cf" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/Dto/UserDto.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/entity/UserEntity.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/entity/UserEntity.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/sys/controller/SysUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/sys/controller/SysUserController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/sys/dao/SysUserDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/sys/dao/SysUserDao.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/sys/entity/SysUserEntity.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/sys/entity/SysUserEntity.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/sys/service/impl/SysUserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/sys/service/impl/SysUserServiceImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/logback-spring.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/logback-spring.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/sys/SysUserDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/sys/SysUserDao.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/lz/modules/app/entity/UserEntity.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/lz/modules/app/entity/UserEntity.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/lz/modules/app/service/impl/StaffServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/lz/modules/app/service/impl/StaffServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/lz/modules/sys/controller/SysUserController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/lz/modules/sys/controller/SysUserController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/lz/modules/sys/entity/SysUserEntity.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/lz/modules/sys/entity/SysUserEntity.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/lz/modules/sys/service/impl/SysUserServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/lz/modules/sys/service/impl/SysUserServiceImpl.class" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -184,7 +172,7 @@
       <workItem from="1588163384182" duration="74761000" />
       <workItem from="1588936950753" duration="95758000" />
       <workItem from="1590038091791" duration="38394000" />
-      <workItem from="1590136970394" duration="24193000" />
+      <workItem from="1590136970394" duration="26305000" />
     </task>
     <servers />
   </component>
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index 8cd99cce..66dfa23e 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -8,7 +8,7 @@
     <springProfile name="dev,test">
         <logger name="org.springframework.web" level="INFO"/>
         <logger name="org.springboot.sample" level="INFO" />
-<!--        <logger name="com.lz.modules.app.dao" level="DEBUG" />-->
+<!--        <logger name="com.lz.modules.sys.dao" level="DEBUG" />-->
         <logger name="io.lz" level="DEBUG" />
     </springProfile>
 
diff --git a/src/main/resources/mapper/sys/SysUserDao.xml b/src/main/resources/mapper/sys/SysUserDao.xml
index 8b8ad68c..d0b10c18 100644
--- a/src/main/resources/mapper/sys/SysUserDao.xml
+++ b/src/main/resources/mapper/sys/SysUserDao.xml
@@ -22,7 +22,7 @@
 	</select>
 
     <select id="getUserInfos" resultType="com.lz.modules.app.Dto.UserDto">
-		select su.*,sr.role_name from sys_user su left join sys_user_role sur on su.user_id=sur.user_id left join sys_role sr on
+		select su.*,GROUP_CONCAT(sr.role_name) role_name from sys_user su left join sys_user_role sur on su.user_id=sur.user_id left join sys_role sr on
 		sur.role_id=sr.role_id where 1=1
         <if test="realName != null and realName != ''">
             and su.real_name like concat('%',#{realName},'%')
@@ -36,11 +36,12 @@
         <if test="roleName != null and roleName != ''">
             and sr.role_name like concat('%',#{roleName},'%')
         </if>
+        GROUP BY su.user_id
         limit #{startIndex}, #{pageLimit}
     </select>
 
     <select id="getTotalCount" resultType="java.lang.Integer">
-		select count(su.user_id) from sys_user su left join sys_user_role sur on su.user_id=sur.user_id left join sys_role sr on
+		select count(DISTINCT(su.user_id)) from sys_user su left join sys_user_role sur on su.user_id=sur.user_id left join sys_role sr on
 		sur.role_id=sr.role_id where 1=1
         <if test="realName != null and realName != ''">
             and su.real_name like concat('%',#{realName},'%')
diff --git a/target/classes/logback-spring.xml b/target/classes/logback-spring.xml
index 3c3c33fa..d8881167 100644
--- a/target/classes/logback-spring.xml
+++ b/target/classes/logback-spring.xml
@@ -8,7 +8,7 @@
     <springProfile name="dev,test">
         <logger name="org.springframework.web" level="INFO"/>
         <logger name="org.springboot.sample" level="INFO" />
-        <logger name="com.lz.modules.app.dao" level="DEBUG" />
+        <logger name="com.lz.modules.sys.dao" level="DEBUG" />
         <logger name="io.lz" level="DEBUG" />
     </springProfile>
 
diff --git a/target/classes/mapper/sys/SysUserDao.xml b/target/classes/mapper/sys/SysUserDao.xml
index 8b8ad68c..d0b10c18 100644
--- a/target/classes/mapper/sys/SysUserDao.xml
+++ b/target/classes/mapper/sys/SysUserDao.xml
@@ -22,7 +22,7 @@
 	</select>
 
     <select id="getUserInfos" resultType="com.lz.modules.app.Dto.UserDto">
-		select su.*,sr.role_name from sys_user su left join sys_user_role sur on su.user_id=sur.user_id left join sys_role sr on
+		select su.*,GROUP_CONCAT(sr.role_name) role_name from sys_user su left join sys_user_role sur on su.user_id=sur.user_id left join sys_role sr on
 		sur.role_id=sr.role_id where 1=1
         <if test="realName != null and realName != ''">
             and su.real_name like concat('%',#{realName},'%')
@@ -36,11 +36,12 @@
         <if test="roleName != null and roleName != ''">
             and sr.role_name like concat('%',#{roleName},'%')
         </if>
+        GROUP BY su.user_id
         limit #{startIndex}, #{pageLimit}
     </select>
 
     <select id="getTotalCount" resultType="java.lang.Integer">
-		select count(su.user_id) from sys_user su left join sys_user_role sur on su.user_id=sur.user_id left join sys_role sr on
+		select count(DISTINCT(su.user_id)) from sys_user su left join sys_user_role sur on su.user_id=sur.user_id left join sys_role sr on
 		sur.role_id=sr.role_id where 1=1
         <if test="realName != null and realName != ''">
             and su.real_name like concat('%',#{realName},'%')