Merge remote-tracking branch 'origin/master'

pipe-network-service/zksy-admin/src/main/java/com/zksy/web/controller/system/SysUserController.java

@@ -253,4 +253,13 @@ public class SysUserController extends BaseController
     {
         return success(deptService.selectDeptTreeList(dept));
     }
+
+
+    /**
+     * 获取全部有效用户
+     */
+    @GetMapping("/enabledAll")
+    public AjaxResult enabledAll() {
+        return success(userService.selectAllEnabledUser());
+    }
 }

pipe-network-service/zksy-system/src/main/java/com/zksy/system/mapper/SysUserMapper.java

@@ -19,6 +19,13 @@ public interface SysUserMapper
      */
     public List<SysUser> selectUserList(SysUser sysUser);
 
+    /**
+     * 查询全部有效用户（未删除且状态正常）
+     * 
+     * @return 有效用户信息集合
+     */
+    public List<SysUser> selectAllEnabledUser();
+
     /**
      * 根据条件分页查询已配用户角色列表
      * 

pipe-network-service/zksy-system/src/main/java/com/zksy/system/service/ISysUserService.java

@@ -18,6 +18,13 @@ public interface ISysUserService
      */
     public List<SysUser> selectUserList(SysUser user);
 
+    /**
+     * 查询全部有效用户（未删除且状态正常）
+     * 
+     * @return 有效用户信息集合
+     */
+    public List<SysUser> selectAllEnabledUser();
+
     /**
      * 根据条件分页查询已分配用户角色列表
      * 

pipe-network-service/zksy-system/src/main/java/com/zksy/system/service/impl/SysUserServiceImpl.java

@@ -78,6 +78,17 @@ public class SysUserServiceImpl implements ISysUserService
         return userMapper.selectUserList(user);
     }
 
+    /**
+     * 查询全部有效用户（未删除且状态正常，不做数据权限过滤）
+     * 
+     * @return 有效用户信息集合
+     */
+    @Override
+    public List<SysUser> selectAllEnabledUser()
+    {
+        return userMapper.selectAllEnabledUser();
+    }
+
     /**
      * 根据条件分页查询已分配用户角色列表
      * 

pipe-network-service/zksy-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -86,7 +86,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		${params.dataScope}
 	</select>
 	
-	<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
+    <select id="selectAllEnabledUser" resultMap="SysUserResult">
+        select u.user_id, u.dept_id, u.nick_name, u.user_name
+        from app_user.sys_user u
+        where u.del_flag = '0' and u.status = '0'
+        order by u.nick_name
+    </select>
+
+    <select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
 	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
 	    from app_user.sys_user u
 			 left join app_user.sys_dept d on u.dept_id = d.dept_id