库内管理模块数据权限隔离

mhd_wms/src/main/java/com/mhd/wms/application/service/differentManage/DifferentManageApplicationService.java

@@ -32,10 +32,21 @@ public class DifferentManageApplicationService {
 
     public List<DifferentManagePO> queryList(DifferentManageDO differentManageDO) {
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        if (loginUser != null) {
+        if (loginUser != null && loginUser.getUserPo() != null) {
+            Long userOrganizationId = loginUser.getUserPo().getOrganizationId();
+            // 当前登录用户组织ID为2827时，查询所有组织的数据
+            if (userOrganizationId != null && userOrganizationId == 2827L) {
+                // 不设置organizationId，查询所有组织的数据
+                differentManageDO.setOrganizationId(null);
+            } else {
+                // 其他情况，只查询当前登录用户所属组织的数据
+                if (userOrganizationId != null) {
+                    differentManageDO.setOrganizationId(userOrganizationId);
+                }
+            }
             Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId();
             if (topOrganizationId != null && topOrganizationId != 1) {
-                differentManageDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+                differentManageDO.setTopOrganizationId(topOrganizationId);
             }
             AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid());
             differentManageDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId());

mhd_wms/src/main/java/com/mhd/wms/application/service/investigationManage/InvestigationManageApplicationService.java

@@ -64,10 +64,21 @@ public class InvestigationManageApplicationService {
 
     public List<InvestigationManagePO> queryList(InvestigationManageDO investigationManageDO) {
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        if (loginUser != null) {
+        if (loginUser != null && loginUser.getUserPo() != null) {
+            Long userOrganizationId = loginUser.getUserPo().getOrganizationId();
+            // 当前登录用户组织ID为2827时，查询所有组织的数据
+            if (userOrganizationId != null && userOrganizationId == 2827L) {
+                // 不设置organizationId，查询所有组织的数据
+                investigationManageDO.setOrganizationId(null);
+            } else {
+                // 其他情况，只查询当前登录用户所属组织的数据
+                if (userOrganizationId != null) {
+                    investigationManageDO.setOrganizationId(userOrganizationId);
+                }
+            }
             Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId();
             if (topOrganizationId != null && topOrganizationId != 1) {
-                investigationManageDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+                investigationManageDO.setTopOrganizationId(topOrganizationId);
             }
             AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid());
             investigationManageDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId());

mhd_wms/src/main/java/com/mhd/wms/application/service/shiftManage/ShiftManageApplicationService.java

@@ -67,10 +67,21 @@ public class ShiftManageApplicationService {
 
     public List<ShiftManagePO> queryList(ShiftManageDO shiftManageDO) {
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        if (loginUser != null){
+        if (loginUser != null && loginUser.getUserPo() != null) {
+            Long userOrganizationId = loginUser.getUserPo().getOrganizationId();
+            // 当前登录用户组织ID为2827时，查询所有组织的数据
+            if (userOrganizationId != null && userOrganizationId == 2827L) {
+                // 不设置organizationId，查询所有组织的数据
+                shiftManageDO.setOrganizationId(null);
+            } else {
+                // 其他情况，只查询当前登录用户所属组织的数据
+                if (userOrganizationId != null) {
+                    shiftManageDO.setOrganizationId(userOrganizationId);
+                }
+            }
             Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId();
-            if (topOrganizationId != null && topOrganizationId != 1){
+            if (topOrganizationId != null && topOrganizationId != 1) {
-                shiftManageDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+                shiftManageDO.setTopOrganizationId(topOrganizationId);
             }
             AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid());
             shiftManageDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId());