优化

platform-dao/src/main/java/com/platform/dao/enums/SysRoleCodeEnum.java

@@ -199,6 +199,10 @@ public enum SysRoleCodeEnum {
      * 筹建-部门负责人
      */
     DEPT_LEADER,
+    /**
+     * 闲置设备审核人
+     */
+    XZSBSH,
     ;
 
 }

platform-dao/src/main/java/com/platform/dao/mapper/upms/SysUserMapper.java

@@ -20,6 +20,8 @@ import java.util.List;
 @Component(value = "sysUserMapper")
 public interface SysUserMapper extends MyMapper<SysUser> {
 
+    List<SysUserVO> getUnusedUsers(SysUserDTO dto);
+
     List<SysUserVO> getSysUserVO(SysUserDTO sysUserDTO);
 
     void updateUserInfo(SysUserDTO sysUserDTO);

platform-dao/src/main/resources/mapper/upms/SysUserMapper.xml

@@ -230,4 +230,24 @@
         GROUP BY user.`user_id`
         order by user.update_time desc
     </select>
+
+    <select id="getUnusedUsers" parameterType="com.platform.dao.dto.upms.SysUserDTO"
+            resultType="com.platform.dao.vo.SysUserVO">
+        select  user.username as username,user.real_name realName, user.user_id userId  from t_sys_user user
+        join t_sys_user_role urole on urole.user_id = user.user_id
+        join t_sys_role role on urole.role_id = role.role_id
+        where user.status = 1
+        <if test="roleCode != null">
+            and role.role_code = #{roleCode}
+        </if>
+        <if test="deptId != null and deptId != ''">
+            and dept.dept_id = #{deptId}
+        </if>
+        <if test="roleCodes != null  and roleCodes.size >0">
+            AND role.role_code in
+            <foreach item="item" index="index" collection="roleCodes" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+    </select>
 </mapper>

platform-rest/src/main/java/com/platform/rest/controller/upms/SysUserController.java

@@ -284,6 +284,11 @@ public class SysUserController {
         return new R<>(sysUserService.getDeptChildrenRoleUser(sysUserDTO));
     }
 
+    @GetMapping("/getUnusedUsers")
+    public R getUnusedUsers(SysUserDTO sysUserDTO) {
+        return new R<>(sysUserService.getUnusedUsers(sysUserDTO));
+    }
+
     /**
      * 项目角色的人
      *

platform-service/src/main/java/com/platform/service/upms/SysUserService.java

@@ -11,6 +11,7 @@ import com.platform.dao.vo.UserInfoVO;
 import com.platform.dao.vo.im.base.ImportResultVO;
 import com.platform.dao.vo.im.upms.ImportSysUserVO;
 import com.platform.service.base.IBaseService;
+import redis.clients.jedis.BinaryClient;
 
 import java.util.List;
 
@@ -21,6 +22,7 @@ import java.util.List;
  * @Version Copyright (c) 2019,北京乾元坤和科技有限公司 All rights reserved.
  */
 public interface SysUserService extends IBaseService<SysUser, SysUserDTO> {
+    List<SysUserVO> getUnusedUsers(SysUserDTO dto);
 
     List<SysUserVO> getSysUserVO(SysUserDTO sysUserDTO);
 

platform-service/src/main/java/com/platform/service/upms/impl/SysUserServiceImpl.java

@@ -108,6 +108,12 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser,
     @Value("${security.oauth2.client.client-secret}")
     private String clientSecret;
 
+    @Override
+    public List<SysUserVO> getUnusedUsers(SysUserDTO dto) {
+        dto.setRoleCode(SysRoleCodeEnum.XZSBSH.name());
+        return mapper.getUnusedUsers(dto);
+    }
+
     @Override
     public List<SysUserVO> getSysUserVO(SysUserDTO sysUserDTO) {
         return mapper.getSysUserVO(sysUserDTO);