用户选择弹框加姓名检索，去掉角色检索

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 roleName) {
+    public ResponseMessage list(int page, int pageSize, String account, String uname) {
-        IPage<Map<String, Object>> list = userEOService.list(page, pageSize, account, roleName);
+        IPage<Map<String, Object>> list = userEOService.list(page, pageSize, account, uname);
         list.getRecords().forEach(c -> {
             try {
                 c.put("CELLPHONE_NUMBER", StringUtils.isNotEmpty(c.get("CELLPHONE_NUMBER")) ? EncryptUtil.decrypt(c.get("CELLPHONE_NUMBER").toString())

adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/UserEODao.java

@@ -23,7 +23,7 @@ public interface UserEODao extends BaseMapper<UserEO> {
 
     List<Map<String, Object>> list(@Param("current")int current ,@Param("size") int size ,
                                  @Param("account") String account,
-                                    @Param("roleName") String roleName);
+                                    @Param("uname") String uname);
 
     /**
      * 查询用户及用户所对应的角色
@@ -49,7 +49,7 @@ public interface UserEODao extends BaseMapper<UserEO> {
 
     List<UserEO> getOwnLeader(@Param("Vo") List<OrgEO> orgEOList);
 
-    long listCount(@Param("account") String account, @Param("roleName") String roleName);
+    long listCount(@Param("account") String account, @Param("uname") String uname);
 
     List<String> selectAccout();
 

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 roleName) {
+    public IPage<Map<String, Object>> list(int pageNo, int pageSize, String account, String uname) {
         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, roleName);
+        List<Map<String, Object>> list = dao.list(current, pageSize, account, uname);
-        long count =  dao.listCount(account,roleName);
+        long count =  dao.listCount(account,uname);
         page.setTotal(count);
         page.setRecords(list);
         return page;

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 roleName);
+    IPage<Map<String, Object>> list(int pageNo, int pageSize, String account, String uname);
 
     void delete(String ids);
 

adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml

@@ -16,8 +16,8 @@
             <if test="account !='' and account !=null">
                 and ACCOUNT like  CONCAT('%',CONCAT(#{account},'%'))
             </if>
-            <if test="roleName !='' and roleName !=null">
+            <if test="uname !='' and uname !=null">
-                and tr.NAME like  CONCAT('%',CONCAT(#{roleName},'%'))
+                and USNAME like  CONCAT('%',CONCAT(#{uname},'%'))
             </if>
         ORDER BY UPDATE_TIME DESC
         LIMIT #{current},#{size}
@@ -40,8 +40,8 @@
         <if test="account !='' and account !=null">
             and ACCOUNT like  CONCAT('%',CONCAT(#{account},'%'))
         </if>
-        <if test="roleName !='' and roleName !=null">
+        <if test="uname !='' and uname !=null">
-            and NAME like  CONCAT('%',CONCAT(#{roleName},'%'))
+            and USNAME like  CONCAT('%',CONCAT(#{uname},'%'))
         </if>
 
     </select>