weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

数据权限BUG修改

Browse Source
This commit is contained in:
秦鸿展
2026-01-20 08:45:30 +08:00
parent aab59723f9
commit f283c66278
2 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_product/src/main/java/com/linke/product/application/service/common/CommonApplicationService.java
+23 -16
View File
@@ -77,25 +77,32 @@ public class CommonApplicationService {
List<Long> longs = iOrganizationSvc.selectOrganizationIdsByOrganizationId(organizationId); List<Long> longs = iOrganizationSvc.selectOrganizationIdsByOrganizationId(organizationId);
dataPermission.setOrganizationIdList(longs); dataPermission.setOrganizationIdList(longs);
}else { }else {
//获取当前用户数据权限 // 数据权限：organizationId等于2827时，为南光组织，查询所有组织的数据
UserDataPermissionQueryDTO userDataPermissionQueryDTO = new UserDataPermissionQueryDTO(); if (organizationId != null && organizationId.equals(2827L)) {
userDataPermissionQueryDTO.setMenuId(permissionMenuId); // 南光组织（organizationId=2827）：可以查询所有组织的数据
userDataPermissionQueryDTO.setOrganizationId(organizationId); List<Long> longs = iOrganizationSvc.selectAllOrganizationId();
userDataPermissionQueryDTO.setUserId(userId); dataPermission.setOrganizationIdList(longs);
AjaxResult info = userServiceFeign.findUserDataPermission(userDataPermissionQueryDTO); } else {
if("200".equals(String.valueOf(info.get("code")))){ //获取当前用户数据权限
UserDataPermissionPO userDataPermissionPO = JSONObject.parseObject(JSONObject.toJSONString(info.get("data")), UserDataPermissionPO.class); UserDataPermissionQueryDTO userDataPermissionQueryDTO = new UserDataPermissionQueryDTO();
if(userDataPermissionPO.getUserDataOrganizationStatus() != null){ userDataPermissionQueryDTO.setMenuId(permissionMenuId);
//1表示可以查询当前组织及下级组织的数据，反之只能看到自己创建的数据 userDataPermissionQueryDTO.setOrganizationId(organizationId);
if(userDataPermissionPO.getUserDataOrganizationStatus() == 1){ userDataPermissionQueryDTO.setUserId(userId);
//获取当前组织全部下级组织id AjaxResult info = userServiceFeign.findUserDataPermission(userDataPermissionQueryDTO);
List<Long> longs = iOrganizationSvc.selectOrganizationIdsByOrganizationId(organizationId); if("200".equals(String.valueOf(info.get("code")))){
dataPermission.setOrganizationIdList(longs); UserDataPermissionPO userDataPermissionPO = JSONObject.parseObject(JSONObject.toJSONString(info.get("data")), UserDataPermissionPO.class);
if(userDataPermissionPO.getUserDataOrganizationStatus() != null){
//1表示可以查询当前组织及下级组织的数据，反之只能看到自己创建的数据
if(userDataPermissionPO.getUserDataOrganizationStatus() == 1){
//获取当前组织全部下级组织id
List<Long> longs = iOrganizationSvc.selectOrganizationIdsByOrganizationId(organizationId);
dataPermission.setOrganizationIdList(longs);
}else {
dataPermission.setCreateBy(userId);
}
}else { }else {
dataPermission.setCreateBy(userId); dataPermission.setCreateBy(userId);
} }
}else {
dataPermission.setCreateBy(userId);
} }
} }
} }
mhd_product/src/main/java/com/linke/product/interfaces/facade/organization/OrganizationApi.java
+1
View File
@@ -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);