diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/handoverTaskOrder/HandoverTaskOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/handoverTaskOrder/HandoverTaskOrderApplicationService.java
index a2abba9fe..c4567e89f 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/application/service/handoverTaskOrder/HandoverTaskOrderApplicationService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/handoverTaskOrder/HandoverTaskOrderApplicationService.java
@@ -63,10 +63,21 @@ public class HandoverTaskOrderApplicationService {
 
     public List<HandoverTaskOrderPO> queryList(HandoverTaskOrderDO handoverTaskOrderDO) {
         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，查询所有组织的数据
+                handoverTaskOrderDO.setOrganizationId(null);
+            } else {
+                // 其他情况，只查询当前登录用户所属组织的数据
+                if (userOrganizationId != null) {
+                    handoverTaskOrderDO.setOrganizationId(userOrganizationId);
+                }
+            }
             Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId();
-            if (topOrganizationId != null && topOrganizationId != 1){
-                handoverTaskOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+            if (topOrganizationId != null && topOrganizationId != 1) {
+                handoverTaskOrderDO.setTopOrganizationId(topOrganizationId);
             }
             AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid());
             handoverTaskOrderDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId());
diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java
index a4237991d..61aaac165 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java
@@ -61,13 +61,22 @@ public class PickingOrderApplicationService {
 
     public List<PickingOrderPO> queryList(PickingOrderDO pickingOrderDO) {
         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，查询所有组织的数据
+                pickingOrderDO.setOrganizationId(null);
+            } else {
+                // 其他情况，只查询当前登录用户所属组织的数据
+                if (userOrganizationId != null) {
+                    pickingOrderDO.setOrganizationId(userOrganizationId);
+                }
+            }
             Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId();
-            if (topOrganizationId != null && topOrganizationId != 1){
-                pickingOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+            if (topOrganizationId != null && topOrganizationId != 1) {
+                pickingOrderDO.setTopOrganizationId(topOrganizationId);
             }
-            //AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid());
-            //pickingOrderDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId());
         }
         List<PickingOrderPO> pickingOrderPOList = pickingOrderDomainService.queryList(pickingOrderDO);
         
diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java
index d24d10301..b02a7b624 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java
@@ -85,6 +85,23 @@ public class StockOutOrderApplicationService {
             AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid());
             stockOutOrderDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId());
         }*/
+        if (loginUser != null && loginUser.getUserPo() != null) {
+            Long userOrganizationId = loginUser.getUserPo().getOrganizationId();
+            // 当前登录用户组织ID为2827时，查询所有组织的数据
+            if (userOrganizationId != null && userOrganizationId == 2827L) {
+                // 不设置organizationId，查询所有组织的数据
+                stockOutOrderDO.setOrganizationId(null);
+            } else {
+                // 其他情况，只查询当前登录用户所属组织的数据
+                if (userOrganizationId != null) {
+                    stockOutOrderDO.setOrganizationId(userOrganizationId);
+                }
+            }
+            Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId();
+            if (topOrganizationId != null && topOrganizationId != 1) {
+                stockOutOrderDO.setTopOrganizationId(topOrganizationId);
+            }
+        }
         return stockOutOrderDomainService.queryList(stockOutOrderDO);
     }
 
diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutTaskOrder/StockOutTaskOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutTaskOrder/StockOutTaskOrderApplicationService.java
index 3d4a4bdfa..bb7423128 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutTaskOrder/StockOutTaskOrderApplicationService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutTaskOrder/StockOutTaskOrderApplicationService.java
@@ -46,10 +46,21 @@ public class StockOutTaskOrderApplicationService {
 
     public List<StockOutTaskOrderPO> queryList(StockOutTaskOrderDO stockOutTaskOrderDO) {
         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，查询所有组织的数据
+                stockOutTaskOrderDO.setOrganizationId(null);
+            } else {
+                // 其他情况，只查询当前登录用户所属组织的数据
+                if (userOrganizationId != null) {
+                    stockOutTaskOrderDO.setOrganizationId(userOrganizationId);
+                }
+            }
             Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId();
-            if (topOrganizationId != null && topOrganizationId != 1){
-                stockOutTaskOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+            if (topOrganizationId != null && topOrganizationId != 1) {
+                stockOutTaskOrderDO.setTopOrganizationId(topOrganizationId);
             }
             AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid());
             stockOutTaskOrderDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId());