派工取消部门强关联，关联维修角色

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

@@ -3,6 +3,7 @@ package com.platform.dao.mapper.upms;
 
 import com.platform.dao.config.MyMapper;
 import com.platform.dao.dto.upms.SysUserDTO;
+import com.platform.dao.dto.upms.SysUserDeptDTO;
 import com.platform.dao.entity.upms.SysUser;
 import com.platform.dao.vo.SysUserVO;
 import org.apache.ibatis.annotations.Param;
@@ -51,4 +52,6 @@ public interface SysUserMapper extends MyMapper<SysUser> {
      * @return
      */
     List<SysUserVO> selectDeptRoleUser(SysUserDTO sysUserDTO);
+
+    List<SysUserVO> getSysUserList(SysUserDeptDTO sysUserDeptDTO);
 }

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

@@ -34,5 +34,4 @@ public interface SysUserRoleMapper extends MyMapper<SysUserRole> {
      * @return ：
      */
     List<SysUserRole> selectListByRoleAndUserStatus(@Param("roleId") String roleId, @Param("status") Integer status);
-
 }

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

@@ -132,4 +132,17 @@
         from t_sys_user
         where user_id = #{value}
     </select>
+
+    <select id="getSysUserList"
+            parameterType="com.platform.dao.dto.upms.SysUserDeptDTO"
+            resultType="com.platform.dao.vo.SysUserVO">
+            select distinct 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
+                    role.role_name='维修人员'
+                    and user.status=1
+
+    </select>
 </mapper>

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

@@ -7,6 +7,7 @@ import com.platform.dao.dto.upms.SysUserDeptDTO;
 import com.platform.dao.enums.DeptNatureEnum;
 import com.platform.dao.util.UserUtil;
 import com.platform.service.upms.SysUserDeptService;
+import com.platform.service.upms.SysUserService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -28,6 +29,8 @@ public class SysUserDeptController {
 
     private final SysUserDeptService sysUserDeptService;
 
+    private final SysUserService sysUserService;
+
 
     /**
      * 查询用户列表
@@ -37,7 +40,7 @@ public class SysUserDeptController {
      */
     @GetMapping("/user-dept/dept-code")
     public R queryUserVO(SysUserDeptDTO sysUserDeptDTO) {
-        return new R<>(sysUserDeptService.selectByDept(sysUserDeptDTO));
+        return new R<>(sysUserService.getSysUserList(sysUserDeptDTO));
     }
 
     /**

platform-service/src/main/java/com/platform/service/repair/strategy/impl/AllocateRepairBaseStrategy.java

@@ -112,7 +112,7 @@ public class AllocateRepairBaseStrategy extends AbstractRepairBaseStrategy {
         String userNames = ConfigCache.getLabelByValueAllowNull(SysConfigEnum.REPAIR_SUPER_USERS.name()); // 超级用户
         if(StringUtils.isNotBlank(userNames)){
             String arr[]=getStringArarry(userNames);
-            for(int i=0;i<arr.length;i++){
+            for(int i=0;i<arr.length-1;i++){
                 if(arr[i].equals(userInfo.getUsername())){
                     RepairApplicationForm applicationForm = new RepairApplicationForm();
                     applicationForm.setId(model.getId());

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

@@ -4,6 +4,7 @@ package com.platform.service.upms;
 import com.platform.dao.bean.MyPage;
 import com.platform.dao.dto.upms.SysDeptDTO;
 import com.platform.dao.dto.upms.SysUserDTO;
+import com.platform.dao.dto.upms.SysUserDeptDTO;
 import com.platform.dao.entity.upms.SysUser;
 import com.platform.dao.vo.SysUserVO;
 import com.platform.dao.vo.UserInfoVO;
@@ -208,4 +209,6 @@ public interface SysUserService extends IBaseService<SysUser, SysUserDTO> {
      * @return
      */
     List<SysUserVO> selectDeptRoleUser(SysUserDTO sysUserDTO);
+
+    List<SysUserVO> getSysUserList(SysUserDeptDTO sysUserDeptDTO);
 }

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

@@ -751,4 +751,10 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser,
     public List<SysUserVO> selectDeptRoleUser(SysUserDTO sysUserDTO) {
         return mapper.selectDeptRoleUser(sysUserDTO);
     }
+
+    @Override
+    public List<SysUserVO> getSysUserList(SysUserDeptDTO sysUserDeptDTO) {
+        List<SysUserVO> sysUserVOS=mapper.getSysUserList(sysUserDeptDTO);
+        return sysUserVOS;
+    }
 }