From c134f11742f13b7769c9da0148f41ac1b895d18b Mon Sep 17 00:00:00 2001
From: lixuetao <lixuetao@syxysoft.com>
Date: Wed, 13 Dec 2023 20:14:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A7=92=E8=89=B2=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=97=A0=E6=95=88=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/adc/da/sys/controller/UserEOController.java   | 4 ++--
 .../src/main/java/com/adc/da/sys/dao/mysql/UserEODao.java  | 7 +++++--
 .../java/com/adc/da/sys/service/UserEOServiceImpl.java     | 6 +++---
 .../com/adc/da/sys/service/iservice/IUserEoService.java    | 2 +-
 .../resources/mybatis/mapper/sys/mysql/UserEOMapper.xml    | 7 ++++++-
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java
index 6c90bef..9fdd200 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java
@@ -120,8 +120,8 @@ public class UserEOController extends BaseController<UserEO> {
 
     @ApiOperation("获取所有用户")
     @GetMapping("/list")
-    public ResponseMessage list(int page, int pageSize, String account, String uname) {
-        IPage<Map<String, Object>> list = userEOService.list(page, pageSize, account, uname);
+    public ResponseMessage list(int page, int pageSize, String account, String uname, String roleName) {
+        IPage<Map<String, Object>> list = userEOService.list(page, pageSize, account, uname, roleName);
         list.getRecords().forEach(c -> {
             try {
                 c.put("CELLPHONE_NUMBER", StringUtils.isNotEmpty(c.get("CELLPHONE_NUMBER")) ? EncryptUtil.decrypt(c.get("CELLPHONE_NUMBER").toString())
diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/UserEODao.java b/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/UserEODao.java
index e7e19cf..0860877 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/UserEODao.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/UserEODao.java
@@ -23,7 +23,8 @@ public interface UserEODao extends BaseMapper<UserEO> {
 
     List<Map<String, Object>> list(@Param("current")int current ,@Param("size") int size ,
                                  @Param("account") String account,
-                                    @Param("uname") String uname);
+                                   @Param("uname") String uname,
+                                   @Param("rolename") String rolename);
 
     /**
      * 查询用户及用户所对应的角色
@@ -49,7 +50,9 @@ public interface UserEODao extends BaseMapper<UserEO> {
 
     List<UserEO> getOwnLeader(@Param("Vo") List<OrgEO> orgEOList);
 
-    long listCount(@Param("account") String account, @Param("uname") String uname);
+    long listCount(@Param("account") String account,
+                   @Param("uname") String uname,
+                   @Param("rolename") String rolename);
 
     List<String> selectAccout();
 
diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java
index 122bf58..ef22bb0 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java
@@ -303,14 +303,14 @@ public class UserEOServiceImpl implements IUserEoService {
     }
 
     @Override
-    public IPage<Map<String, Object>> list(int pageNo, int pageSize, String account, String uname) {
+    public IPage<Map<String, Object>> list(int pageNo, int pageSize, String account, String uname, String rolename) {
         IPage page = new Page();
         int i = pageNo - 1 ;
         int current = i == 0 ? 0 : i * pageSize;
         page.setCurrent(pageNo);
         page.setSize(pageSize);
-        List<Map<String, Object>> list = dao.list(current, pageSize, account, uname);
-        long count =  dao.listCount(account,uname);
+        List<Map<String, Object>> list = dao.list(current, pageSize, account, uname, rolename);
+        long count =  dao.listCount(account,uname, rolename);
         page.setTotal(count);
         page.setRecords(list);
         return page;
diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IUserEoService.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IUserEoService.java
index 07f9f56..4ce314d 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IUserEoService.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IUserEoService.java
@@ -48,7 +48,7 @@ public interface IUserEoService {
      */
     List<UserVO> getUserByIdListNodel(List<String> userIdList);
 
-    IPage<Map<String, Object>> list(int pageNo, int pageSize, String account, String uname);
+    IPage<Map<String, Object>> list(int pageNo, int pageSize, String account, String uname, String roleName);
 
     void delete(String ids);
 
diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml
index e18a5bd..1c7c989 100644
--- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml
+++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml
@@ -19,6 +19,9 @@
             <if test="uname !='' and uname !=null">
                 and USNAME like  CONCAT('%',CONCAT(#{uname},'%'))
             </if>
+            <if test="rolename !='' and rolename !=null">
+                and tr.NAME like  CONCAT('%',CONCAT(#{rolename},'%'))
+            </if>
         ORDER BY UPDATE_TIME DESC
         LIMIT #{current},#{size}
             ) t1
@@ -43,7 +46,9 @@
         <if test="uname !='' and uname !=null">
             and USNAME like  CONCAT('%',CONCAT(#{uname},'%'))
         </if>
-
+        <if test="rolename !='' and rolename !=null">
+            and tr.NAME like  CONCAT('%',CONCAT(#{rolename},'%'))
+        </if>
     </select>
 
     <select id="getUserCount"  resultType="java.lang.Long">