diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java index d54d22857..f8c6462bd 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java @@ -308,6 +308,55 @@ public class LeaseApplicationService { * businessDateEnd 业务结束时间 */ public List warehouseOccupancyRate(ShipperLeaseDetailsDO shipperLeaseDetailsDO) { + // 数据权限：根据 organizationId 来设置查询权限 + LoginUser loginUser = SecurityUtils.getLoginUser(); + if (loginUser != null && loginUser.getUserPo() != null) { + Long userOrganizationId = loginUser.getUserPo().getOrganizationId(); + Long frontendOrganizationId = shipperLeaseDetailsDO.getOrganizationId(); // 前端传递的 organizationId + + // 当前登录用户的 organizationId 为 2827 时，可查全部组织数据；其他组织只能查自己 + if (userOrganizationId != null && userOrganizationId == 2827L) { + // 南光组织（organizationId=2827）：可以查询所有组织的数据 + // 如果前端传递了 organizationId（包括2827或其他组织），使用前端传递的值进行过滤 + // 如果前端没有传递 organizationId，清空组织过滤条件，查询所有组织的数据 + if (frontendOrganizationId != null) { + // 前端传递了 organizationId（包括2827或其他组织），使用前端传递的值进行过滤 + shipperLeaseDetailsDO.setOrganizationId(frontendOrganizationId); + shipperLeaseDetailsDO.setTopOrganizationId(null); // 明确设置为 null，避免使用 topOrganizationId 条件 + } else { + // 前端没有传递 organizationId，清空组织过滤条件，查询所有组织的数据 + shipperLeaseDetailsDO.setOrganizationId(null); + shipperLeaseDetailsDO.setTopOrganizationId(null); + } + } else { + // 其他组织：设置organizationId，只查询当前组织的数据 + // 如果前端传递了 organizationId，验证是否与当前登录用户的组织ID一致 + if (frontendOrganizationId != null && userOrganizationId != null) { + // 前端传递了 organizationId，验证是否与当前登录用户的组织ID一致 + if (!frontendOrganizationId.equals(userOrganizationId)) { + // 前端传递了其他组织的 organizationId，强制使用当前登录用户的组织ID，防止越权查询 + shipperLeaseDetailsDO.setOrganizationId(userOrganizationId); + } + // 如果前端传递的 organizationId 与当前登录用户的组织ID一致，使用前端传递的值 + } else { + // 前端没有传递 organizationId，使用当前登录用户的组织ID + if (userOrganizationId != null) { + shipperLeaseDetailsDO.setOrganizationId(userOrganizationId); + } + } + // 只有当 organizationId 为 null 时，才使用 topOrganizationId 作为查询条件 + // 如果 organizationId 不为 null，则优先使用 organizationId，不使用 topOrganizationId + if (shipperLeaseDetailsDO.getOrganizationId() == null) { + Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId(); + if (topOrganizationId != null && topOrganizationId != 1) { + shipperLeaseDetailsDO.setTopOrganizationId(topOrganizationId); + } + } else { + // 如果 organizationId 不为 null，清空 topOrganizationId，确保查询使用 organizationId + shipperLeaseDetailsDO.setTopOrganizationId(null); + } + } + } //仓库id 和 开始结束时间作为查询条件 查数据库 查出来当前仓库所有的 List shipperLeaseDetailsList = shipperLeaseDetailsService.queryList(shipperLeaseDetailsDO); if (shipperLeaseDetailsList == null || shipperLeaseDetailsList.isEmpty()) { @@ -349,6 +398,16 @@ public class LeaseApplicationService { warehouseOccupancyRate.setWarehouseName(shipperLeaseDetail.getWarehouseName()); warehouseOccupancyRate.setBusinessDate(date); warehouseOccupancyRate.setWarehouseId(shipperLeaseDetail.getWarehouseId()); + // 设置组织相关字段（从第一个非空记录中获取） + if (warehouseOccupancyRate.getOrganizationId() == null && shipperLeaseDetail.getOrganizationId() != null) { + warehouseOccupancyRate.setOrganizationId(shipperLeaseDetail.getOrganizationId()); + } + if (warehouseOccupancyRate.getOrganizationName() == null && shipperLeaseDetail.getOrganizationName() != null) { + warehouseOccupancyRate.setOrganizationName(shipperLeaseDetail.getOrganizationName()); + } + if (warehouseOccupancyRate.getTopOrganizationId() == null && shipperLeaseDetail.getTopOrganizationId() != null) { + warehouseOccupancyRate.setTopOrganizationId(shipperLeaseDetail.getTopOrganizationId()); + } } warehouseOccupancyRate.setEntireLeaseArea(entireLeaseArea); warehouseOccupancyRate.setFractionalLeaseArea(fractionalLeaseArea); diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/differentManage/DifferentManageApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/differentManage/DifferentManageApplicationService.java index 3b21a29e6..4c770eb10 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/differentManage/DifferentManageApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/differentManage/DifferentManageApplicationService.java @@ -34,22 +34,55 @@ public class DifferentManageApplicationService { LoginUser loginUser = SecurityUtils.getLoginUser(); if (loginUser != null && loginUser.getUserPo() != null) { Long userOrganizationId = loginUser.getUserPo().getOrganizationId(); - // 当前登录用户组织ID为2827时，查询所有组织的数据 + Long frontendOrganizationId = differentManageDO.getOrganizationId(); // 前端传递的 organizationId + + // 数据权限：根据 organizationId 来设置查询权限 + // 当前登录用户的 organizationId 为 2827 时，可查全部组织数据；其他组织只能查自己 if (userOrganizationId != null && userOrganizationId == 2827L) { - // 不设置organizationId，查询所有组织的数据 - differentManageDO.setOrganizationId(null); + // 南光组织（organizationId=2827）：可以查询所有组织的数据 + // 如果前端传递了 organizationId（包括2827或其他组织），使用前端传递的值进行过滤 + // 如果前端没有传递 organizationId，清空组织过滤条件，查询所有组织的数据 + if (frontendOrganizationId != null) { + // 前端传递了 organizationId（包括2827或其他组织），使用前端传递的值进行过滤 + differentManageDO.setOrganizationId(frontendOrganizationId); + differentManageDO.setTopOrganizationId(null); // 明确设置为 null，避免使用 topOrganizationId 条件 + } else { + // 前端没有传递 organizationId，清空组织过滤条件，查询所有组织的数据 + differentManageDO.setOrganizationId(null); + differentManageDO.setTopOrganizationId(null); + } } else { - // 其他情况，只查询当前登录用户所属组织的数据 - if (userOrganizationId != null) { - differentManageDO.setOrganizationId(userOrganizationId); + // 其他组织：设置organizationId，只查询当前组织的数据 + // 如果前端传递了 organizationId，验证是否与当前登录用户的组织ID一致 + if (frontendOrganizationId != null && userOrganizationId != null) { + // 前端传递了 organizationId，验证是否与当前登录用户的组织ID一致 + if (!frontendOrganizationId.equals(userOrganizationId)) { + // 前端传递了其他组织的 organizationId，强制使用当前登录用户的组织ID，防止越权查询 + differentManageDO.setOrganizationId(userOrganizationId); + } + // 如果前端传递的 organizationId 与当前登录用户的组织ID一致，使用前端传递的值 + } else { + // 前端没有传递 organizationId，使用当前登录用户的组织ID + if (userOrganizationId != null) { + differentManageDO.setOrganizationId(userOrganizationId); + } + } + // 只有当 organizationId 为 null 时，才使用 topOrganizationId 作为查询条件 + // 如果 organizationId 不为 null，则优先使用 organizationId，不使用 topOrganizationId + if (differentManageDO.getOrganizationId() == null) { + Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId(); + if (topOrganizationId != null && topOrganizationId != 1) { + differentManageDO.setTopOrganizationId(topOrganizationId); + } + } else { + // 如果 organizationId 不为 null，清空 topOrganizationId，确保查询使用 organizationId + differentManageDO.setTopOrganizationId(null); } } - Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId(); - if (topOrganizationId != null && topOrganizationId != 1) { - differentManageDO.setTopOrganizationId(topOrganizationId); - } AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid()); - differentManageDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId()); + if (associationWarehouseCacheDO != null) { + differentManageDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId()); + } } return differentManageDomainService.queryList(differentManageDO); } diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/inventoryAdjustmentRecord/InventoryAdjustmentRecordApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/inventoryAdjustmentRecord/InventoryAdjustmentRecordApplicationService.java index f2560edb4..bcdd97300 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/inventoryAdjustmentRecord/InventoryAdjustmentRecordApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/inventoryAdjustmentRecord/InventoryAdjustmentRecordApplicationService.java @@ -50,13 +50,57 @@ public class InventoryAdjustmentRecordApplicationService { public List queryList(InventoryAdjustmentRecordDO inventoryAdjustmentRecordDO) { LoginUser loginUser = SecurityUtils.getLoginUser(); - if (loginUser != null){ - Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId(); - if (topOrganizationId != null && topOrganizationId != 1){ - inventoryAdjustmentRecordDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId()); + if (loginUser != null && loginUser.getUserPo() != null){ + Long userOrganizationId = loginUser.getUserPo().getOrganizationId(); + Long frontendOrganizationId = inventoryAdjustmentRecordDO.getOrganizationId(); // 前端传递的 organizationId + + // 数据权限：根据 organizationId 来设置查询权限 + // 当前登录用户的 organizationId 为 2827 时，可查全部组织数据；其他组织只能查自己 + if (userOrganizationId != null && userOrganizationId == 2827L) { + // 南光组织（organizationId=2827）：可以查询所有组织的数据 + // 如果前端传递了 organizationId（包括2827或其他组织），使用前端传递的值进行过滤 + // 如果前端没有传递 organizationId，清空组织过滤条件，查询所有组织的数据 + if (frontendOrganizationId != null) { + // 前端传递了 organizationId（包括2827或其他组织），使用前端传递的值进行过滤 + inventoryAdjustmentRecordDO.setOrganizationId(frontendOrganizationId); + inventoryAdjustmentRecordDO.setTopOrganizationId(null); // 明确设置为 null，避免使用 topOrganizationId 条件 + } else { + // 前端没有传递 organizationId，清空组织过滤条件，查询所有组织的数据 + inventoryAdjustmentRecordDO.setOrganizationId(null); + inventoryAdjustmentRecordDO.setTopOrganizationId(null); + } + } else { + // 其他组织：设置organizationId，只查询当前组织的数据 + // 如果前端传递了 organizationId，验证是否与当前登录用户的组织ID一致 + if (frontendOrganizationId != null && userOrganizationId != null) { + // 前端传递了 organizationId，验证是否与当前登录用户的组织ID一致 + if (!frontendOrganizationId.equals(userOrganizationId)) { + // 前端传递了其他组织的 organizationId，强制使用当前登录用户的组织ID，防止越权查询 + inventoryAdjustmentRecordDO.setOrganizationId(userOrganizationId); + } + // 如果前端传递的 organizationId 与当前登录用户的组织ID一致，使用前端传递的值 + } else { + // 前端没有传递 organizationId，使用当前登录用户的组织ID + if (userOrganizationId != null) { + inventoryAdjustmentRecordDO.setOrganizationId(userOrganizationId); + } + } + // 只有当 organizationId 为 null 时，才使用 topOrganizationId 作为查询条件 + // 如果 organizationId 不为 null，则优先使用 organizationId，不使用 topOrganizationId + if (inventoryAdjustmentRecordDO.getOrganizationId() == null) { + Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId(); + if (topOrganizationId != null && topOrganizationId != 1) { + inventoryAdjustmentRecordDO.setTopOrganizationId(topOrganizationId); + } + } else { + // 如果 organizationId 不为 null，清空 topOrganizationId，确保查询使用 organizationId + inventoryAdjustmentRecordDO.setTopOrganizationId(null); + } } AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid()); - inventoryAdjustmentRecordDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId()); + if (associationWarehouseCacheDO != null) { + inventoryAdjustmentRecordDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId()); + } } List inventoryAdjustmentRecordPOS = inventoryAdjustmentRecordDomainService.queryList(inventoryAdjustmentRecordDO); diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/investigationManage/InvestigationManageApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/investigationManage/InvestigationManageApplicationService.java index 9108b6750..71e4023f6 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/investigationManage/InvestigationManageApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/investigationManage/InvestigationManageApplicationService.java @@ -66,22 +66,55 @@ public class InvestigationManageApplicationService { LoginUser loginUser = SecurityUtils.getLoginUser(); if (loginUser != null && loginUser.getUserPo() != null) { Long userOrganizationId = loginUser.getUserPo().getOrganizationId(); - // 当前登录用户组织ID为2827时，查询所有组织的数据 + Long frontendOrganizationId = investigationManageDO.getOrganizationId(); // 前端传递的 organizationId + + // 数据权限：根据 organizationId 来设置查询权限 + // 当前登录用户的 organizationId 为 2827 时，可查全部组织数据；其他组织只能查自己 if (userOrganizationId != null && userOrganizationId == 2827L) { - // 不设置organizationId，查询所有组织的数据 - investigationManageDO.setOrganizationId(null); + // 南光组织（organizationId=2827）：可以查询所有组织的数据 + // 如果前端传递了 organizationId（包括2827或其他组织），使用前端传递的值进行过滤 + // 如果前端没有传递 organizationId，清空组织过滤条件，查询所有组织的数据 + if (frontendOrganizationId != null) { + // 前端传递了 organizationId（包括2827或其他组织），使用前端传递的值进行过滤 + investigationManageDO.setOrganizationId(frontendOrganizationId); + investigationManageDO.setTopOrganizationId(null); // 明确设置为 null，避免使用 topOrganizationId 条件 + } else { + // 前端没有传递 organizationId，清空组织过滤条件，查询所有组织的数据 + investigationManageDO.setOrganizationId(null); + investigationManageDO.setTopOrganizationId(null); + } } else { - // 其他情况，只查询当前登录用户所属组织的数据 - if (userOrganizationId != null) { - investigationManageDO.setOrganizationId(userOrganizationId); + // 其他组织：设置organizationId，只查询当前组织的数据 + // 如果前端传递了 organizationId，验证是否与当前登录用户的组织ID一致 + if (frontendOrganizationId != null && userOrganizationId != null) { + // 前端传递了 organizationId，验证是否与当前登录用户的组织ID一致 + if (!frontendOrganizationId.equals(userOrganizationId)) { + // 前端传递了其他组织的 organizationId，强制使用当前登录用户的组织ID，防止越权查询 + investigationManageDO.setOrganizationId(userOrganizationId); + } + // 如果前端传递的 organizationId 与当前登录用户的组织ID一致，使用前端传递的值 + } else { + // 前端没有传递 organizationId，使用当前登录用户的组织ID + if (userOrganizationId != null) { + investigationManageDO.setOrganizationId(userOrganizationId); + } + } + // 只有当 organizationId 为 null 时，才使用 topOrganizationId 作为查询条件 + // 如果 organizationId 不为 null，则优先使用 organizationId，不使用 topOrganizationId + if (investigationManageDO.getOrganizationId() == null) { + Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId(); + if (topOrganizationId != null && topOrganizationId != 1) { + investigationManageDO.setTopOrganizationId(topOrganizationId); + } + } else { + // 如果 organizationId 不为 null，清空 topOrganizationId，确保查询使用 organizationId + investigationManageDO.setTopOrganizationId(null); } } - Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId(); - if (topOrganizationId != null && topOrganizationId != 1) { - investigationManageDO.setTopOrganizationId(topOrganizationId); - } AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid()); - investigationManageDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId()); + if (associationWarehouseCacheDO != null) { + investigationManageDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId()); + } } return investigationManageDomainService.queryList(investigationManageDO); } diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/materialInventory/MaterialInventoryApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/materialInventory/MaterialInventoryApplicationService.java index 11667a13e..048e57de0 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/materialInventory/MaterialInventoryApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/materialInventory/MaterialInventoryApplicationService.java @@ -53,20 +53,50 @@ public class MaterialInventoryApplicationService { LoginUser loginUser = SecurityUtils.getLoginUser(); if (loginUser != null && loginUser.getUserPo() != null){ Long userOrganizationId = loginUser.getUserPo().getOrganizationId(); - // 当前登录用户组织ID为2827时，查询所有组织的数据 + Long frontendOrganizationId = materialInventoryDO.getOrganizationId(); // 前端传递的 organizationId + + // 数据权限：根据 organizationId 来设置查询权限 + // 当前登录用户的 organizationId 为 2827 时，可查全部组织数据；其他组织只能查自己 if (userOrganizationId != null && userOrganizationId == 2827L) { - // 不设置organizationId，查询所有组织的数据 - materialInventoryDO.setOrganizationId(null); + // 南光组织（organizationId=2827）：可以查询所有组织的数据 + // 如果前端传递了 organizationId（包括2827或其他组织），使用前端传递的值进行过滤 + // 如果前端没有传递 organizationId，清空组织过滤条件，查询所有组织的数据 + if (frontendOrganizationId != null) { + // 前端传递了 organizationId（包括2827或其他组织），使用前端传递的值进行过滤 + materialInventoryDO.setOrganizationId(frontendOrganizationId); + materialInventoryDO.setTopOrganizationId(null); // 明确设置为 null，避免使用 topOrganizationId 条件 + } else { + // 前端没有传递 organizationId，清空组织过滤条件，查询所有组织的数据 + materialInventoryDO.setOrganizationId(null); + materialInventoryDO.setTopOrganizationId(null); + } } else { - // 其他情况，只查询当前登录用户所属组织的数据 - if (userOrganizationId != null) { - materialInventoryDO.setOrganizationId(userOrganizationId); + // 其他组织：设置organizationId，只查询当前组织的数据 + // 如果前端传递了 organizationId，验证是否与当前登录用户的组织ID一致 + if (frontendOrganizationId != null && userOrganizationId != null) { + // 前端传递了 organizationId，验证是否与当前登录用户的组织ID一致 + if (!frontendOrganizationId.equals(userOrganizationId)) { + // 前端传递了其他组织的 organizationId，强制使用当前登录用户的组织ID，防止越权查询 + materialInventoryDO.setOrganizationId(userOrganizationId); + } + // 如果前端传递的 organizationId 与当前登录用户的组织ID一致，使用前端传递的值 + } else { + // 前端没有传递 organizationId，使用当前登录用户的组织ID + if (userOrganizationId != null) { + materialInventoryDO.setOrganizationId(userOrganizationId); + } + } + // 只有当 organizationId 为 null 时，才使用 topOrganizationId 作为查询条件 + // 如果 organizationId 不为 null，则优先使用 organizationId，不使用 topOrganizationId + if (materialInventoryDO.getOrganizationId() == null) { + Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId(); + if (topOrganizationId != null && topOrganizationId != 1) { + materialInventoryDO.setTopOrganizationId(topOrganizationId); + } + } else { + // 如果 organizationId 不为 null，清空 topOrganizationId，确保查询使用 organizationId + materialInventoryDO.setTopOrganizationId(null); } - } - // 处理topOrganizationId逻辑 - Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId(); - if (topOrganizationId != null && topOrganizationId != 1){ - materialInventoryDO.setTopOrganizationId(topOrganizationId); } // 前端有传warehouseId则优先使用传参；未传时才使用"用户关联仓库"作为默认值 if (materialInventoryDO.getWarehouseId() == null) { diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/shiftManage/ShiftManageApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/shiftManage/ShiftManageApplicationService.java index 0c84bc688..0501c0a07 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/shiftManage/ShiftManageApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/shiftManage/ShiftManageApplicationService.java @@ -69,22 +69,55 @@ public class ShiftManageApplicationService { LoginUser loginUser = SecurityUtils.getLoginUser(); if (loginUser != null && loginUser.getUserPo() != null) { Long userOrganizationId = loginUser.getUserPo().getOrganizationId(); - // 当前登录用户组织ID为2827时，查询所有组织的数据 + Long frontendOrganizationId = shiftManageDO.getOrganizationId(); // 前端传递的 organizationId + + // 数据权限：根据 organizationId 来设置查询权限 + // 当前登录用户的 organizationId 为 2827 时，可查全部组织数据；其他组织只能查自己 if (userOrganizationId != null && userOrganizationId == 2827L) { - // 不设置organizationId，查询所有组织的数据 - shiftManageDO.setOrganizationId(null); + // 南光组织（organizationId=2827）：可以查询所有组织的数据 + // 如果前端传递了 organizationId（包括2827或其他组织），使用前端传递的值进行过滤 + // 如果前端没有传递 organizationId，清空组织过滤条件，查询所有组织的数据 + if (frontendOrganizationId != null) { + // 前端传递了 organizationId（包括2827或其他组织），使用前端传递的值进行过滤 + shiftManageDO.setOrganizationId(frontendOrganizationId); + shiftManageDO.setTopOrganizationId(null); // 明确设置为 null，避免使用 topOrganizationId 条件 + } else { + // 前端没有传递 organizationId，清空组织过滤条件，查询所有组织的数据 + shiftManageDO.setOrganizationId(null); + shiftManageDO.setTopOrganizationId(null); + } } else { - // 其他情况，只查询当前登录用户所属组织的数据 - if (userOrganizationId != null) { - shiftManageDO.setOrganizationId(userOrganizationId); + // 其他组织：设置organizationId，只查询当前组织的数据 + // 如果前端传递了 organizationId，验证是否与当前登录用户的组织ID一致 + if (frontendOrganizationId != null && userOrganizationId != null) { + // 前端传递了 organizationId，验证是否与当前登录用户的组织ID一致 + if (!frontendOrganizationId.equals(userOrganizationId)) { + // 前端传递了其他组织的 organizationId，强制使用当前登录用户的组织ID，防止越权查询 + shiftManageDO.setOrganizationId(userOrganizationId); + } + // 如果前端传递的 organizationId 与当前登录用户的组织ID一致，使用前端传递的值 + } else { + // 前端没有传递 organizationId，使用当前登录用户的组织ID + if (userOrganizationId != null) { + shiftManageDO.setOrganizationId(userOrganizationId); + } + } + // 只有当 organizationId 为 null 时，才使用 topOrganizationId 作为查询条件 + // 如果 organizationId 不为 null，则优先使用 organizationId，不使用 topOrganizationId + if (shiftManageDO.getOrganizationId() == null) { + Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId(); + if (topOrganizationId != null && topOrganizationId != 1) { + shiftManageDO.setTopOrganizationId(topOrganizationId); + } + } else { + // 如果 organizationId 不为 null，清空 topOrganizationId，确保查询使用 organizationId + shiftManageDO.setTopOrganizationId(null); } } - Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId(); - if (topOrganizationId != null && topOrganizationId != 1) { - shiftManageDO.setTopOrganizationId(topOrganizationId); - } AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid()); - shiftManageDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId()); + if (associationWarehouseCacheDO != null) { + shiftManageDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId()); + } } return shiftManageDomainService.queryList(shiftManageDO); } diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/statementStatistics/StatementStatisticsService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/statementStatistics/StatementStatisticsService.java index 154818684..c052f836a 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/statementStatistics/StatementStatisticsService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/statementStatistics/StatementStatisticsService.java @@ -53,10 +53,52 @@ public class StatementStatisticsService { public List queryImmediateInventoryList(ImmediateInventoryDO immediateInventoryDO) { LoginUser loginUser = SecurityUtils.getLoginUser(); - if (loginUser != null){ - Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId(); - if (topOrganizationId != null && topOrganizationId != 1){ - immediateInventoryDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId()); + if (loginUser != null && loginUser.getUserPo() != null){ + Long userOrganizationId = loginUser.getUserPo().getOrganizationId(); + Long frontendOrganizationId = immediateInventoryDO.getOrganizationId(); // 前端传递的 organizationId + + // 数据权限：根据 organizationId 来设置查询权限 + // 当前登录用户的 organizationId 为 2827 时，可查全部组织数据；其他组织只能查自己 + if (userOrganizationId != null && userOrganizationId == 2827L) { + // 南光组织（organizationId=2827）：可以查询所有组织的数据 + // 如果前端传递了 organizationId（包括2827或其他组织），使用前端传递的值进行过滤 + // 如果前端没有传递 organizationId，清空组织过滤条件，查询所有组织的数据 + if (frontendOrganizationId != null) { + // 前端传递了 organizationId（包括2827或其他组织），使用前端传递的值进行过滤 + immediateInventoryDO.setOrganizationId(frontendOrganizationId); + immediateInventoryDO.setTopOrganizationId(null); // 明确设置为 null，避免使用 topOrganizationId 条件 + } else { + // 前端没有传递 organizationId，清空组织过滤条件，查询所有组织的数据 + immediateInventoryDO.setOrganizationId(null); + immediateInventoryDO.setTopOrganizationId(null); + } + } else { + // 其他组织：设置organizationId，只查询当前组织的数据 + // 如果前端传递了 organizationId，验证是否与当前登录用户的组织ID一致 + if (frontendOrganizationId != null && userOrganizationId != null) { + // 前端传递了 organizationId，验证是否与当前登录用户的组织ID一致 + if (!frontendOrganizationId.equals(userOrganizationId)) { + // 前端传递了其他组织的 organizationId，强制使用当前登录用户的组织ID，防止越权查询 + immediateInventoryDO.setOrganizationId(userOrganizationId); + } + // 如果前端传递的 organizationId 与当前登录用户的组织ID一致，使用前端传递的值 + } else { + // 前端没有传递 organizationId，使用当前登录用户的组织ID + if (userOrganizationId != null) { + immediateInventoryDO.setOrganizationId(userOrganizationId); + } + } + // 只有当 organizationId 为 null 时，才使用 topOrganizationId 作为查询条件 + // 如果 organizationId 不为 null，则优先使用 organizationId，不使用 topOrganizationId + if (immediateInventoryDO.getOrganizationId() == null) { + Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId(); + if (topOrganizationId != null && topOrganizationId != 1) { + immediateInventoryDO.setTopOrganizationId(topOrganizationId); + } + } else { + // 如果 organizationId 不为 null，清空 topOrganizationId，确保查询使用 organizationId + immediateInventoryDO.setTopOrganizationId(null); + } } // 只有在用户没有明确指定仓库参数时，才使用缓存中的仓库信息 // 如果用户已经传递了 warehouseId、warehouseCode 或 warehouseName，优先使用这些值 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 11926c071..f0e390f00 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 @@ -597,7 +597,7 @@ public class StockOutOrderApplicationService { StockOutOrderDO stockOutOrderD = new StockOutOrderDO(); StockOutOrder stockOutOrderDb = stockOutOrderService.getById(outOrderId); if (stockOutOrderDb == null){ - throw new ServiceException("出库单ID不存在"); + throw new ServiceException("出库单不存在"); } BeanUtils.copyProperties(stockOutOrderDb, stockOutOrderD); List outMaterialDetailList = outMaterialDetailService.list(new QueryWrapper().lambda() @@ -627,7 +627,7 @@ public class StockOutOrderApplicationService { detail.setStorageCode(materialInventory.getStorageCode()); } stockOutOrderD.setMaterialDetailList(materialDetailList); - StockOutOrderDO assembleStockOutOrderDO = assembleParamByOutOrder(stockOutOrderDO); + StockOutOrderDO assembleStockOutOrderDO = assembleParamByOutOrder(stockOutOrderD); Boolean assignResult = stockOutOrderDomainService.autoAssign(assembleStockOutOrderDO); if (!assignResult) { result = false; diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java index 3b32aeacb..26cf0e4f5 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java @@ -417,9 +417,9 @@ public class OutMaterialDetailImpl extends ServiceImpl 0) { + /*if (alreadyAllocationQuantity != null && alreadyAllocationQuantity.compareTo(BigDecimal.ZERO) > 0) { continue; - } + }*/ Long materialInventoryId = outMaterialDetail.getMaterialInventoryId(); BigDecimal allocationQuantity = outMaterialDetail.getAllocationQuantity(); if (ObjectUtils.isEmpty(allocationQuantity)) { diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/statementStatistics/po/ImmediateInventoryPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/statementStatistics/po/ImmediateInventoryPO.java index 205eb5638..51c8c7574 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/statementStatistics/po/ImmediateInventoryPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/statementStatistics/po/ImmediateInventoryPO.java @@ -115,5 +115,13 @@ public class ImmediateInventoryPO { @ApiModelProperty("物料更多属性列表（批次属性）") private List materialMoreDetailList; + @ApiModelProperty("组织ID") + private Long organizationId; + + @ApiModelProperty("组织名称") + private String organizationName; + + @ApiModelProperty("顶级组织ID") + private Long topOrganizationId; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java index 2176a9a67..7148beb91 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java @@ -258,10 +258,6 @@ public class StockOutOrderDomainService { */ @Transactional(rollbackFor = Exception.class) public Boolean autoAssign(StockOutOrderDO stockOutOrderDO){ - List outOrderIds = stockOutOrderDO.getOutOrderIds(); - if (outOrderIds == null || outOrderIds.isEmpty()){ - throw new ServiceException("出库单ID不能为空"); - } StockOutOrder stockOutOrderDb = stockOutOrderService.getById(stockOutOrderDO.getOutOrderId()); if (stockOutOrderDb == null){ throw new ServiceException("出库单不存在"); @@ -269,8 +265,6 @@ public class StockOutOrderDomainService { if (stockOutOrderDb.getStatus() > 3){ throw new ServiceException("收货单已完成分配"); } - List outMaterialDetailList = outMaterialDetailService.list(new QueryWrapper().lambda() - .eq(OutMaterialDetail::getOutOrderNumber, stockOutOrderDb.getOutOrderNumber())); //修改物料明细信息 StockOutOrderPO stockOutOrderPO = outMaterialDetailService.batchAssignUpdate(stockOutOrderDb.getOutOrderNumber(), stockOutOrderDO.getMaterialDetailList()); //修改出库单 diff --git a/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml b/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml index ab1b2f821..6a4dfc771 100644 --- a/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml +++ b/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml @@ -433,6 +433,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + +