数据权限BUG修改
This commit is contained in:
+7
@@ -76,6 +76,12 @@ public class CommonApplicationService {
|
|||||||
//获取当前组织全部下级组织id
|
//获取当前组织全部下级组织id
|
||||||
List<Long> longs = iOrganizationSvc.selectOrganizationIdsByOrganizationId(organizationId);
|
List<Long> longs = iOrganizationSvc.selectOrganizationIdsByOrganizationId(organizationId);
|
||||||
dataPermission.setOrganizationIdList(longs);
|
dataPermission.setOrganizationIdList(longs);
|
||||||
|
}else {
|
||||||
|
// 数据权限:organizationId等于2827时,为南光组织,查询所有组织的数据
|
||||||
|
if (organizationId != null && organizationId.equals(2827L)) {
|
||||||
|
// 南光组织(organizationId=2827):可以查询所有组织的数据
|
||||||
|
List<Long> longs = iOrganizationSvc.selectAllOrganizationId();
|
||||||
|
dataPermission.setOrganizationIdList(longs);
|
||||||
} else {
|
} else {
|
||||||
//获取当前用户数据权限
|
//获取当前用户数据权限
|
||||||
UserDataPermissionQueryDTO userDataPermissionQueryDTO = new UserDataPermissionQueryDTO();
|
UserDataPermissionQueryDTO userDataPermissionQueryDTO = new UserDataPermissionQueryDTO();
|
||||||
@@ -100,6 +106,7 @@ public class CommonApplicationService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return dataPermission;
|
return dataPermission;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
@@ -52,6 +52,7 @@ public class OrganizationApi extends BaseController {
|
|||||||
//转换实体
|
//转换实体
|
||||||
BeanUtils.copyProperties(organizationDto, organizationPo);
|
BeanUtils.copyProperties(organizationDto, organizationPo);
|
||||||
//判断当前登录人数据权限
|
//判断当前登录人数据权限
|
||||||
|
//获取当前登录人的组织ID
|
||||||
DataPermission dataPermission = commonApplicationService.dataPermission(organizationPo.getPermissionMenuId());
|
DataPermission dataPermission = commonApplicationService.dataPermission(organizationPo.getPermissionMenuId());
|
||||||
startPage();
|
startPage();
|
||||||
List<OrganizationPo> list = organizationASvc.selectOrganizationList(organizationPo,dataPermission);
|
List<OrganizationPo> list = organizationASvc.selectOrganizationList(organizationPo,dataPermission);
|
||||||
|
|||||||
Reference in New Issue
Block a user