diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/batch/BatchApplicationService.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/batch/BatchApplicationService.java
index 433041bed..76b31d1af 100644
--- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/batch/BatchApplicationService.java
+++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/batch/BatchApplicationService.java
@@ -39,10 +39,21 @@ public class BatchApplicationService {
 
     public List<BatchPO> queryList(BatchDO batchDO) {
         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，查询所有组织的数据
+                batchDO.setOrganizationId(null);
+            } else {
+                // 其他情况，只查询当前登录用户所属组织的数据
+                if (userOrganizationId != null) {
+                    batchDO.setOrganizationId(userOrganizationId);
+                }
+            }
             Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId();
-            if (topOrganizationId != null && topOrganizationId != 1){
-                batchDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+            if (topOrganizationId != null && topOrganizationId != 1) {
+                batchDO.setTopOrganizationId(topOrganizationId);
             }
         }
         List<BatchPO> batchPOS = batchDomainService.queryList(batchDO);
diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/brand/BrandApplicationService.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/brand/BrandApplicationService.java
index f4652016b..ceb488e0e 100644
--- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/brand/BrandApplicationService.java
+++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/brand/BrandApplicationService.java
@@ -37,10 +37,21 @@ public class BrandApplicationService {
 
     public List<BrandPO> queryList(BrandDO brandDO) {
         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，查询所有组织的数据
+                brandDO.setOrganizationId(null);
+            } else {
+                // 其他情况，只查询当前登录用户所属组织的数据
+                if (userOrganizationId != null) {
+                    brandDO.setOrganizationId(userOrganizationId);
+                }
+            }
             Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId();
-            if (topOrganizationId != null && topOrganizationId != 1){
-                brandDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+            if (topOrganizationId != null && topOrganizationId != 1) {
+                brandDO.setTopOrganizationId(topOrganizationId);
             }
         }
         return brandDomainService.queryList(brandDO);
diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/materialClassify/MaterialClassifyApplicationService.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/materialClassify/MaterialClassifyApplicationService.java
index bab615ff8..f735edcfc 100644
--- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/materialClassify/MaterialClassifyApplicationService.java
+++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/materialClassify/MaterialClassifyApplicationService.java
@@ -29,10 +29,21 @@ public class MaterialClassifyApplicationService {
 
     public List<MaterialClassifyPO> queryList(MaterialClassifyDO materialClassifyDO) {
         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，查询所有组织的数据
+                materialClassifyDO.setOrganizationId(null);
+            } else {
+                // 其他情况，只查询当前登录用户所属组织的数据
+                if (userOrganizationId != null) {
+                    materialClassifyDO.setOrganizationId(userOrganizationId);
+                }
+            }
             Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId();
-            if (topOrganizationId != null && topOrganizationId != 1){
-                materialClassifyDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+            if (topOrganizationId != null && topOrganizationId != 1) {
+                materialClassifyDO.setTopOrganizationId(topOrganizationId);
             }
         }
         return materialClassifyDomainService.queryList(materialClassifyDO);
diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/pack/PackApplicationService.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/pack/PackApplicationService.java
index 13326a0d6..99d770139 100644
--- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/pack/PackApplicationService.java
+++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/pack/PackApplicationService.java
@@ -38,10 +38,21 @@ public class PackApplicationService {
 
     public List<PackPO> queryList(PackDO packDO) {
         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，查询所有组织的数据
+                packDO.setOrganizationId(null);
+            } else {
+                // 其他情况，只查询当前登录用户所属组织的数据
+                if (userOrganizationId != null) {
+                    packDO.setOrganizationId(userOrganizationId);
+                }
+            }
             Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId();
-            if (topOrganizationId != null && topOrganizationId != 1){
-                packDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+            if (topOrganizationId != null && topOrganizationId != 1) {
+                packDO.setTopOrganizationId(topOrganizationId);
             }
         }
         return packDomainService.queryList(packDO);
diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/materialBaseInfo/MaterialBaseInfoApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/materialBaseInfo/MaterialBaseInfoApplicationService.java
index 1eff5f2c4..9f50e7a6d 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/application/service/materialBaseInfo/MaterialBaseInfoApplicationService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/materialBaseInfo/MaterialBaseInfoApplicationService.java
@@ -59,10 +59,21 @@ public class MaterialBaseInfoApplicationService {
 
     public List<MaterialBaseInfoPO> queryList(MaterialBaseInfoDO materialBaseInfoDO) {
         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，查询所有组织的数据
+                materialBaseInfoDO.setOrganizationId(null);
+            } else {
+                // 其他情况，只查询当前登录用户所属组织的数据
+                if (userOrganizationId != null) {
+                    materialBaseInfoDO.setOrganizationId(userOrganizationId);
+                }
+            }
             Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId();
-            if (topOrganizationId != null && topOrganizationId != 1){
-                materialBaseInfoDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+            if (topOrganizationId != null && topOrganizationId != 1) {
+                materialBaseInfoDO.setTopOrganizationId(topOrganizationId);
             }
         }
         List<MaterialBaseInfoPO> materialBaseInfoPOS = materialBaseInfoDomainService.queryList(materialBaseInfoDO);