From 135bd5d380616bf61335108c14c8a31ed63c748a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com> Date: Tue, 24 Feb 2026 08:52:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=A8=A1=E5=9D=97=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=9D=83=E9=99=90=E9=9A=94=E7=A6=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StockInOrderApplicationService.java | 16 ++++++++++++++-- .../StockReceiptOrderApplicationService.java | 16 ++++++++++++++-- .../StockShelfOrderApplicationService.java | 15 +++++++++++++-- 3 files changed, 41 insertions(+), 6 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java index 305a161a0..6e1ad45b2 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java @@ -68,10 +68,22 @@ public class StockInOrderApplicationService { public List queryList(StockInOrderDO stockInOrderDO) { 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，查询所有组织的数据 + stockInOrderDO.setOrganizationId(null); + } else { + // 其他情况，只查询当前登录用户所属组织的数据 + if (userOrganizationId != null) { + stockInOrderDO.setOrganizationId(userOrganizationId); + } + } + // 处理topOrganizationId逻辑 Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId(); if (topOrganizationId != null && topOrganizationId != 1){ - stockInOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId()); + stockInOrderDO.setTopOrganizationId(topOrganizationId); } // 前端有传warehouseId则优先使用传参；未传时才使用"用户关联仓库"作为默认值 if (stockInOrderDO.getWarehouseId() == null) { diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockReceiptOrder/StockReceiptOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockReceiptOrder/StockReceiptOrderApplicationService.java index d3333ed15..3c17f2efc 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockReceiptOrder/StockReceiptOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockReceiptOrder/StockReceiptOrderApplicationService.java @@ -91,10 +91,22 @@ public class StockReceiptOrderApplicationService { public List queryList(StockReceiptOrderDO stockReceiptOrderDO) { 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，查询所有组织的数据 + stockReceiptOrderDO.setOrganizationId(null); + } else { + // 其他情况，只查询当前登录用户所属组织的数据 + if (userOrganizationId != null) { + stockReceiptOrderDO.setOrganizationId(userOrganizationId); + } + } + // 处理topOrganizationId逻辑 Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId(); if (topOrganizationId != null && topOrganizationId != 1){ - stockReceiptOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId()); + stockReceiptOrderDO.setTopOrganizationId(topOrganizationId); } try { AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid()); diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java index 22acbc228..53a3b5443 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java @@ -97,10 +97,21 @@ public class StockShelfOrderApplicationService { public List queryList(StockShelfOrderDO stockShelfOrderDO) { 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，查询所有组织的数据 + stockShelfOrderDO.setOrganizationId(null); + } else { + // 其他情况，只查询当前登录用户所属组织的数据 + if (userOrganizationId != null) { + stockShelfOrderDO.setOrganizationId(userOrganizationId); + } + } Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId(); if (topOrganizationId != null && topOrganizationId != 1){ - stockShelfOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId()); + stockShelfOrderDO.setTopOrganizationId(topOrganizationId); } try { AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid());