otto
/
microservices-dev
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(用户身份状态管理): 成员移出组织/项目，原指派给这个成员的工作项/其他该怎么显示 

新增远程接口：根据部门Id和用户Id获取所有状态的用户身份
This commit is contained in:
OTTO 2024-09-29 15:41:56 +08:00
parent 9b8560a33a
commit e173dbbd8c
7 changed files with 43 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/RemoteUserService.java
View File

@ -213,4 +213,17 @@ public interface RemoteUserService {
R<Set<String>> 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<SysUserDeptRole> getAllStatusUserIdentityByDeptIdAndUserId(
@PathVariable("deptId") Long deptId,
@PathVariable("userId") Long userId,
@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
}

5
microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/factory/RemoteUserFallbackFactory.java
View File

@ -117,6 +117,11 @@ public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserServ
public R<Set<String>> selectMenuPermissionByRoleKey(String roleKey, String source) {
return R.fail("根据角色Key获取菜单权限集合失败:" + throwable.getMessage());
}
@Override
public R<SysUserDeptRole> getAllStatusUserIdentityByDeptIdAndUserId(Long deptId, Long userId, String source) {
return R.fail("根据部门Id和用户Id获取所有状态的用户身份失败:" + throwable.getMessage());
}
};
}
}

15
microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysUserDeptRoleController.java
View File

@ -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<SysUserDeptRole> getAllStatusUserIdentityByDeptIdAndUserId(
@PathVariable("deptId") Long deptId,
@PathVariable("userId") Long userId) {
return R.ok(sysUserDeptRoleService.getAllStatusUserIdentityByDeptIdAndUserId(deptId, userId));
}
/**
* 内部接口-组织下删除用户身份
*/

2
microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysUserDeptRoleMapper.java
View File

@ -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);
}

2
microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysUserDeptRoleService.java
View File

@ -151,4 +151,6 @@ public interface ISysUserDeptRoleService {
void updateUserLoginInfoByDeptId(Long deptId);
List<SysUserDeptRole> selectZoneUserIdentityListByUser(Long userId, Boolean isContainMember, String deptName, String roleName);
SysUserDeptRole getAllStatusUserIdentityByDeptIdAndUserId(Long deptId, Long userId);
}

7
microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysUserDeptRoleServiceImpl.java
View File

@ -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) {

2
microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysUserDeptRoleMapper.xml
View File

@ -226,7 +226,7 @@
WHERE role_id = #{roleId}
and state = 'normal'
</select>
<select id="selectUserIdentityByAllState"
<select id="selectUserIdentityByAllStatus"
resultMap="SysUserDeptRoleResult">
<include refid="selectSysUserDeptRoleDetailVo"/>
<where>