添加用户

zxkf-api/src/main/java/api/controller/system/RoleController.java

@@ -197,8 +197,8 @@ public class RoleController extends BaseController {
      */
     @Log(title = "查询已分配用户角色列表", businessType = BusinessType.QUERY)
     @GetMapping("/authUser/allocatedList")
-    public AjaxResult allocatedList(User user) {
-        List<User> list = userService.selectAllocatedList(user);
+    public AjaxResult allocatedList(long  roleId) {
+        List<User> list = userService.selectAllocatedList(roleId);
         return Success("查询成功", list);
     }
 

zxkf-mapper/src/main/java/api/mapper/system/UserMapper.java

@@ -34,10 +34,10 @@ public interface UserMapper extends BaseMapper<User> {
     /**
      * 根据条件分页查询已配用户角色列表
      *
-     * @param user 用户信息
+     * @param roleId 用户信息
      * @return 用户信息集合信息
      */
-    public List<User> selectAllocatedList(User user);
+    public List<User> selectAllocatedList(long roleId);
 
 
     /**

zxkf-mapper/src/main/resources/mapper/system/UserMapper.xml

@@ -122,12 +122,12 @@ select * from (
         left join sys_user_role ur on u.user_id = ur.user_id
         left join sys_role r on r.role_id = ur.role_id
         where u.del_flag = '0' and r.role_id = #{roleId}
-        <if test="userName != null and userName != ''">
+      <!--  <if test="userName != null and userName != ''">
             AND u.user_name like concat('%', #{userName}, '%')
         </if>
         <if test="phonenumber != null and phonenumber != ''">
             AND u.phonenumber like concat('%', #{phonenumber}, '%')
-        </if>
+        </if> -->
     </select>
 
     <select id="selectUnallocatedList" parameterType="api.entity.database.system.User"

zxkf-service/src/main/java/api/service/system/IUserService.java

@@ -20,10 +20,10 @@ public interface IUserService extends IBaseService<User> {
     /**
      * 根据条件分页查询已分配用户角色列表
      *
-     * @param user 用户信息
+     * @param roleId 用户信息
      * @return 用户信息集合信息
      */
-    public List<User> selectAllocatedList(User user);
+    public List<User> selectAllocatedList(long  roleId);
 
     /**
      * 根据条件分页查询未分配用户角色列表

zxkf-service/src/main/java/api/service/system/impl/UserServiceImpl.java

@@ -57,12 +57,12 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
     /**
      * 根据条件分页查询已分配用户角色列表
      *
-     * @param user 用户信息
+     * @param roleId 角色id
      * @return 用户信息集合信息
      */
     @Override
-    public List<User> selectAllocatedList(User user) {
-        return userMapper.selectAllocatedList(user);
+    public List<User> selectAllocatedList(long  roleId) {
+        return userMapper.selectAllocatedList(roleId);
     }
 
     /**
@@ -133,11 +133,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
         if (!Pattern.matches("^1[3-9]\\d{9}$", user.getPhonenumber())) {
             return false;
         }
-        if (!StringHelper.isNull(entity)) {
-            if (user.getUserId() > 0 && user.getUserId().equals(entity.getUserId())) {
-                return true;
-            }
-            return false;
+        if (entity!=null) {
+            return user.getUserId()!=null&&user.getUserId() > 0 && user.getUserId().equals(entity.getUserId());
         }
         return true;
     }
@@ -154,11 +151,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
         qw.eq(User::getEmail, user.getEmail()).eq(User::getDelFlag, "0");
         User entity = this.getEntity(qw);
 
-        if (!StringHelper.isNull(entity)) {
-            if (user.getUserId() > 0 && user.getUserId().equals(entity.getUserId())) {
-                return true;
-            }
-            return false;
+        if (entity!=null) {
+            return  user.getUserId()!=null&&user.getUserId() > 0 && user.getUserId().equals(entity.getUserId());
         }
         return true;
     }