diff --git a/microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/RemoteUserService.java b/microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/RemoteUserService.java index 66052000f..bf10e3b46 100644 --- a/microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/RemoteUserService.java +++ b/microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/RemoteUserService.java @@ -213,4 +213,17 @@ public interface RemoteUserService { R> selectMenuPermissionByRoleKey(@PathVariable("roleKey") String roleKey , @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + /** + * 根据部门Id和用户Id获取所有状态的用户身份 + * + * @param deptId 组织Id + * @param userId 用户Id + * @param source 请求来源 + * @return 用户身份 + */ + @GetMapping("/SysUserDeptRole/dept/{deptId}/user/{userId}/allStatus") + R getAllStatusUserIdentityByDeptIdAndUserId( + @PathVariable("deptId") Long deptId, + @PathVariable("userId") Long userId, + @RequestHeader(SecurityConstants.FROM_SOURCE) String source); } diff --git a/microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/factory/RemoteUserFallbackFactory.java b/microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/factory/RemoteUserFallbackFactory.java index a67b2e5be..576f0cd1f 100644 --- a/microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/factory/RemoteUserFallbackFactory.java +++ b/microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/factory/RemoteUserFallbackFactory.java @@ -117,6 +117,11 @@ public class RemoteUserFallbackFactory implements FallbackFactory> selectMenuPermissionByRoleKey(String roleKey, String source) { return R.fail("根据角色Key获取菜单权限集合失败:" + throwable.getMessage()); } + + @Override + public R getAllStatusUserIdentityByDeptIdAndUserId(Long deptId, Long userId, String source) { + return R.fail("根据部门Id和用户Id获取所有状态的用户身份失败:" + throwable.getMessage()); + } }; } } diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysUserDeptRoleController.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysUserDeptRoleController.java index 5b6eeb955..afc78e888 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysUserDeptRoleController.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysUserDeptRoleController.java @@ -99,6 +99,21 @@ public class SysUserDeptRoleController extends BaseController { } + /** + * 内部接口-根据部门Id和用户Id获取所有状态的用户身份 + * + * @param deptId 组织Id + * @param userId 用户Id + * @return 用户身份 + */ + @InnerAuth + @GetMapping("/dept/{deptId}/user/{userId}/allStatus") + public R getAllStatusUserIdentityByDeptIdAndUserId( + @PathVariable("deptId") Long deptId, + @PathVariable("userId") Long userId) { + return R.ok(sysUserDeptRoleService.getAllStatusUserIdentityByDeptIdAndUserId(deptId, userId)); + } + /** * 内部接口-组织下删除用户身份 */ diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysUserDeptRoleMapper.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysUserDeptRoleMapper.java index 371263d19..d3ed0aff9 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysUserDeptRoleMapper.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysUserDeptRoleMapper.java @@ -142,5 +142,5 @@ public interface SysUserDeptRoleMapper { * @param deptId 组织Id * @return 用户身份 */ - SysUserDeptRole selectUserIdentityByAllState(@Param("userId") Long userId, @Param("deptId") Long deptId); + SysUserDeptRole selectUserIdentityByAllStatus(@Param("deptId") Long deptId, @Param("userId") Long userId); } diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysUserDeptRoleService.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysUserDeptRoleService.java index 0c4b02e9f..df53df4ab 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysUserDeptRoleService.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysUserDeptRoleService.java @@ -151,4 +151,6 @@ public interface ISysUserDeptRoleService { void updateUserLoginInfoByDeptId(Long deptId); List selectZoneUserIdentityListByUser(Long userId, Boolean isContainMember, String deptName, String roleName); + + SysUserDeptRole getAllStatusUserIdentityByDeptIdAndUserId(Long deptId, Long userId); } diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysUserDeptRoleServiceImpl.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysUserDeptRoleServiceImpl.java index 2f78488d0..ef595971a 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysUserDeptRoleServiceImpl.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysUserDeptRoleServiceImpl.java @@ -423,7 +423,7 @@ public class SysUserDeptRoleServiceImpl implements ISysUserDeptRoleService { private int insertUserDeptRole(SysUserDeptRole sysUserDeptRoleInput) { int success = 0; SysUserDeptRole sysUserDeptRole = - sysUserDeptRoleMapper.selectUserIdentityByAllState(sysUserDeptRoleInput.getUserId(), sysUserDeptRoleInput.getDeptId()); + sysUserDeptRoleMapper.selectUserIdentityByAllStatus(sysUserDeptRoleInput.getDeptId(), sysUserDeptRoleInput.getUserId()); if (sysUserDeptRole == null) { success += insertSysUserDeptRoleDatabase(sysUserDeptRoleInput); updateUserGitLinkRole( @@ -599,6 +599,11 @@ public class SysUserDeptRoleServiceImpl implements ISysUserDeptRoleService { return sysUserDeptRoleList; } + @Override + public SysUserDeptRole getAllStatusUserIdentityByDeptIdAndUserId(Long deptId, Long userId) { + return sysUserDeptRoleMapper.selectUserIdentityByAllStatus(deptId, userId); + } + private SysUser selectSysUserById(Long userId) { SysUser sysUser = sysUserMapper.selectUserById(userId); if (sysUser == null) { diff --git a/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysUserDeptRoleMapper.xml b/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysUserDeptRoleMapper.xml index a3da23e92..0abfe5810 100644 --- a/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysUserDeptRoleMapper.xml +++ b/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysUserDeptRoleMapper.xml @@ -226,7 +226,7 @@ WHERE role_id = #{roleId} and state = 'normal' -