解决缺陷 【APP】演练登记：详情页面，“指挥人”显示为已经停用的人员，应显示为非停用的人员

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/RemoteRoleService.java

@@ -37,7 +37,7 @@ public interface RemoteRoleService {
     List<IdNameVo> getNames(@RequestBody RoleConditionEto condition);
 
     @GetMapping("/role/selectUserByRoleNameAndOrgId")
-    List<SysUser> selectUserByRoleNameAndOrgId(@RequestParam(value = "roleName") String roleName, @RequestParam(value = "orgId") Long orgId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+    List<SysUser> selectUserByRoleNameAndOrgId(@RequestParam(value = "roleName") String roleName, @RequestParam(value = "orgId") Long orgId,@RequestParam(value = "isLock") Integer isLock, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
     @GetMapping("/userRole/getUserRoleId")
     List<Long> getUserRoleId(@RequestParam(value = "userId") Long userId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteRoleFallbackFactory.java

@@ -48,7 +48,7 @@ public class RemoteRoleFallbackFactory implements FallbackFactory<RemoteRoleServ
             }
 
             @Override
-            public List<SysUser> selectUserByRoleNameAndOrgId(String roleName, Long orgId, String inner) {
+            public List<SysUser> selectUserByRoleNameAndOrgId(String roleName, Long orgId, Integer isLock,String inner) {
                 return null;
             }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillTaskServiceImpl.java

@@ -284,7 +284,7 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
         }
         CoreDrillTask finalCoreDrillTask = coreDrillTask;
         List<SysUser> userList = RemoteCallHandlerExecutor.executeRemoteCall(() ->
-                roleService.selectUserByRoleNameAndOrgId("网点负责人", finalCoreDrillTask.getOrgId(), SecurityConstants.INNER), ErrorMsgConstants.QUERY_USER_DATA_ERROR);
+                roleService.selectUserByRoleNameAndOrgId("网点负责人", finalCoreDrillTask.getOrgId(),0, SecurityConstants.INNER), ErrorMsgConstants.QUERY_USER_DATA_ERROR);
         if (ObjectUtil.isNotEmpty(userList)) {
             coreDrillTask.setHostId(userList.get(0).getId());
         } else {

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/CoreEduTrainingTaskServiceImpl.java

@@ -362,7 +362,7 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
 
     private Long getHostUserId(Long orgId) {
         List<SysUser> userList = RemoteCallHandlerExecutor.executeRemoteCall(() ->
-                roleService.selectUserByRoleNameAndOrgId("网点负责人", orgId, SecurityConstants.INNER), ErrorMsgConstants.QUERY_USER_DATA_ERROR);
+                roleService.selectUserByRoleNameAndOrgId("网点负责人", orgId,0, SecurityConstants.INNER), ErrorMsgConstants.QUERY_USER_DATA_ERROR);
         if (ObjectUtil.isNotEmpty(userList)) {
             return userList.get(0).getId();
         } else {

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysRoleController.java

@@ -270,8 +270,8 @@ public class SysRoleController extends BaseController {
     }
 
     @GetMapping("/selectUserByRoleNameAndOrgId")
-    public List<SysUser> selectUserByRoleNameAndOrgId(@RequestParam(value = "roleName") String roleName, @RequestParam(value = "orgId") Long orgId) {
-        return roleService.selectUserByRoleNameAndOrgId(roleName, orgId);
+    public List<SysUser> selectUserByRoleNameAndOrgId(@RequestParam(value = "roleName") String roleName, @RequestParam(value = "orgId") Long orgId,@RequestParam(value = "isLock") Integer isLock) {
+        return roleService.selectUserByRoleNameAndOrgId(roleName, orgId,isLock);
     }
 
     @GetMapping("/getRoles")

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/SysRoleMapper.java

@@ -112,7 +112,7 @@ String selectRoleNameByUserId(Long userId);
      */
      int deleteRoleByIds(Long[] roleIds);
 
-    List<SysUser> selectUserByRoleNameAndOrgId(@Param("roleName") String roleName, @Param("orgId") Long orgId);
+    List<SysUser> selectUserByRoleNameAndOrgId(@Param("roleName") String roleName, @Param("orgId") Long orgId,@Param("isLock") Integer isLock);
 
     /**
      * 查询机构下可用的角色

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/ISysRoleService.java

@@ -192,7 +192,7 @@ String selectRoleNameByUserId(Long userId);
 
     List<SysRole> getRoleByType(String type) ;
 
-    List<SysUser> selectUserByRoleNameAndOrgId(String roleName, Long orgId);
+    List<SysUser> selectUserByRoleNameAndOrgId(String roleName, Long orgId,Integer isLock);
 
     /**
      * 缓存角色数据

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysRoleServiceImpl.java

@@ -468,8 +468,8 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
     }
 
     @Override
-    public List<SysUser> selectUserByRoleNameAndOrgId(String roleName, Long orgId) {
-        return roleMapper.selectUserByRoleNameAndOrgId(roleName, orgId);
+    public List<SysUser> selectUserByRoleNameAndOrgId(String roleName, Long orgId,Integer isLock) {
+        return roleMapper.selectUserByRoleNameAndOrgId(roleName, orgId,isLock);
     }
 
     @Override

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -255,6 +255,9 @@
                  inner join sys_role r on ur.role_id = r.id
         where r.role_name = #{roleName}
           and o.id = #{orgId}
+        <if test="isLock != null">
+            and u.isLock= #{isLock}
+        </if>
     </select>
     <select id="getNamesByOrgId" resultType="com.xunmei.common.core.vo.IdNameVo">
         select r.id,r.role_name as name