From 7ed1ce1ca4f8b48b5e6dab6c79dc1f2d7936a22e Mon Sep 17 00:00:00 2001
From: xiangwbs <xiangwbs@163.com>
Date: Sat, 23 Jun 2018 20:33:46 +0800
Subject: [PATCH] merge

---
 .../com/xwbing/service/sys/SysUserService.java   |  1 -
 .../src/main/resources/mapper/sys/sysRole.xml    | 16 ----------------
 2 files changed, 17 deletions(-)

diff --git a/boot-service/src/main/java/com/xwbing/service/sys/SysUserService.java b/boot-service/src/main/java/com/xwbing/service/sys/SysUserService.java
index 3c0155a..f36a7d8 100644
--- a/boot-service/src/main/java/com/xwbing/service/sys/SysUserService.java
+++ b/boot-service/src/main/java/com/xwbing/service/sys/SysUserService.java
@@ -205,7 +205,6 @@ public class SysUserService {
                 CommonEnum.SexEnum sexEnum = Arrays.stream(CommonEnum.SexEnum.values()).filter(obj -> obj.getCode().equals(sysUser.getSex())).findFirst().get();
                 sysUser.setSexName(sexEnum.getName());
             });
-            pageInfo.setList(all);
         }
         return page.result(page, pageInfo);
     }
diff --git a/boot-service/src/main/resources/mapper/sys/sysRole.xml b/boot-service/src/main/resources/mapper/sys/sysRole.xml
index c538d70..99cef59 100644
--- a/boot-service/src/main/resources/mapper/sys/sysRole.xml
+++ b/boot-service/src/main/resources/mapper/sys/sysRole.xml
@@ -210,20 +210,4 @@
         <include refid="table"/>
         ORDER BY create_time DESC
     </select>
-    <!--&lt;!&ndash; 统计 &ndash;&gt;-->
-    <!--<select id="countByPagin" parameterClass="java.util.Map" resultClass="java.lang.Integer">-->
-    <!--SELECT COUNT(1)-->
-    <!--FROM-->
-    <!--<include refid="table"/>-->
-    <!--<include refid="whereCondition"/>-->
-    <!--</select>-->
-    <!--&lt;!&ndash; 分页 &ndash;&gt;-->
-    <!--<select id="findByPagin" parameterClass="java.util.Map" resultMap="resultMap">-->
-    <!--SELECT-->
-    <!--<include refid="columns"/>-->
-    <!--FROM-->
-    <!--<include refid="table"/>-->
-    <!--<include refid="whereCondition"/>-->
-    <!--order by id desc LIMIT #fromRow#,#pageSize#-->
-    <!--</select>-->
 </mapper>
\ No newline at end of file