数据权限的bug修改260113

2026-01-13 11:32:57 +08:00
parent 935c154136
commit 035593b419
5 changed files with 34 additions and 9 deletions
@@ -54,8 +54,14 @@ public class UserShipperDomainService {
        
        //获取当前登陆人
        LoginUser loginUser = SecurityUtils.getLoginUser();
+        // 如果 organizationId 和 topOrganizationId 都为 null，表示查询所有组织的数据（南光组织查询全部）
+        // 此时不应该设置 userId 过滤条件，否则会限制查询结果
+        boolean isQueryAllOrganizations = (userShipperDO.getOrganizationId() == null && userShipperDO.getTopOrganizationId() == null);
+        
        if(loginUser != null && loginUser.getUserPo() != null && 
-           (loginUser.getUserPo().getBusinessType()==1||loginUser.getUserPo().getBusinessType()==3||loginUser.getUserPo().getUserAccountType()==5)){
+           (loginUser.getUserPo().getBusinessType()==1||loginUser.getUserPo().getBusinessType()==3||loginUser.getUserPo().getUserAccountType()==5) &&
+           !isQueryAllOrganizations) {
+            // 只有在不是查询所有组织的情况下，才设置 userId 过滤条件
            userShipperDO.setUserId(loginUser.getUserid());
        }
        return userShipperRepositoryInterface.selectList(userShipperDO);