Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server

This commit is contained in:
lym
2024-06-25 09:12:53 +08:00
@@ -171,7 +171,8 @@ public class PermissionServiceImpl implements PermissionService {
if (Objects.isNull(role)) {
throw new ServiceException(ErrorCodeConstants.ROLE_NOT_EXISTS);
}
if (Objects.isNull(organId)) {
// 前端没传或者查一次后切换了组织导致跟角色组织不一致的统一为角色的组织
if (Objects.isNull(organId) || ObjectUtil.notEqual(role.getOrganId(), organId)) {
organId = role.getOrganId();
}
final Long finalOrganId = organId;