weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
王奎兴
2026-02-25 14:33:59 +08:00
parent 69d6952315 8443d739d1
commit 280ceaaa7c
34 changed files with 194 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java
+4 -4
View File
@@ -120,8 +120,8 @@ public class LeaseApplicationService {
leaseDO.setTopOrganizationId(topOrganizationId);
}
} else {
// 如果 organizationId 不为 null，清空 topOrganizationId，确保查询使用 organizationId
leaseDO.setTopOrganizationId(null);
// 对于非2827组织，必须设置 topOrganizationId=2827
leaseDO.setTopOrganizationId(2827L);
}
}
}
@@ -352,8 +352,8 @@ public class LeaseApplicationService {
shipperLeaseDetailsDO.setTopOrganizationId(topOrganizationId);
}
} else {
// 如果 organizationId 不为 null，清空 topOrganizationId，确保查询使用 organizationId
shipperLeaseDetailsDO.setTopOrganizationId(null);
// 对于非2827组织，必须设置 topOrganizationId=2827
shipperLeaseDetailsDO.setTopOrganizationId(2827L);
}
}
}
mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/batch/BatchApplicationService.java
+2 -2
View File
@@ -82,8 +82,8 @@ public class BatchApplicationService {
batchDO.setTopOrganizationId(topOrganizationId);
}
} else {
// 如果 organizationId 不为 null，清空 topOrganizationId，确保查询使用 organizationId
batchDO.setTopOrganizationId(null);
// 对于非2827组织，必须设置 topOrganizationId=2827
batchDO.setTopOrganizationId(2827L);
}
}
}
mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/brand/BrandApplicationService.java
+2 -2
View File
@@ -80,8 +80,8 @@ public class BrandApplicationService {
brandDO.setTopOrganizationId(topOrganizationId);
}
} else {
// 如果 organizationId 不为 null，清空 topOrganizationId，确保查询使用 organizationId
brandDO.setTopOrganizationId(null);
// 对于非2827组织，必须设置 topOrganizationId=2827
brandDO.setTopOrganizationId(2827L);
}
}
}
mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/contractManage/ContractManageApplicationService.java
+34 -4
View File
@@ -72,10 +72,40 @@ public class ContractManageApplicationService {
public List<ContractManagePO> queryList(ContractManageDO contractManageDO) {
LoginUser loginUser = SecurityUtils.getLoginUser();
if (loginUser != null){
Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId();
if (topOrganizationId != null && topOrganizationId != 1){
contractManageDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
if (loginUser != null && loginUser.getUserPo() != null) {
Long userOrganizationId = loginUser.getUserPo().getOrganizationId();
Long frontendOrganizationId = contractManageDO.getOrganizationId(); // 前端传递的 organizationId
// 当前登录用户的 organizationId 为 2827 时，可查全部组织数据；其他组织只能查自己且 topOrganizationId=2827
if (userOrganizationId != null && userOrganizationId == 2827L) {
// 南光组织（organizationId=2827）：可以查询所有组织的数据
if (frontendOrganizationId != null) {
// 前端传递了 organizationId（包括2827或其他组织），使用前端传递的值进行过滤
contractManageDO.setOrganizationId(frontendOrganizationId);
contractManageDO.setTopOrganizationId(null); // 明确设置为 null，避免使用 topOrganizationId 条件
} else {
// 前端没有传递 organizationId，清空组织过滤条件，查询所有组织的数据
contractManageDO.setOrganizationId(null);
contractManageDO.setTopOrganizationId(null);
}
} else {
// 其他组织：设置organizationId为当前组织ID，并且设置topOrganizationId=2827
// 如果前端传递了 organizationId，验证是否与当前登录用户的组织ID一致
if (frontendOrganizationId != null && userOrganizationId != null) {
// 前端传递了 organizationId，验证是否与当前登录用户的组织ID一致
if (!frontendOrganizationId.equals(userOrganizationId)) {
// 前端传递了其他组织的 organizationId，强制使用当前登录用户的组织ID，防止越权查询
contractManageDO.setOrganizationId(userOrganizationId);
}
// 如果前端传递的 organizationId 与当前登录用户的组织ID一致，使用前端传递的值
} else {
// 前端没有传递 organizationId，使用当前登录用户的组织ID
if (userOrganizationId != null) {
contractManageDO.setOrganizationId(userOrganizationId);
}
}
// 对于非2827组织，必须设置 topOrganizationId=2827
contractManageDO.setTopOrganizationId(2827L);
}
}
return contractManageDomainService.queryList(contractManageDO);
mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/materialBaseInfo/MaterialBaseInfoApplicationService.java
+2 -2
View File
@@ -86,8 +86,8 @@ public class MaterialBaseInfoApplicationService {
materialBaseInfoDO.setTopOrganizationId(topOrganizationId);
}
} else {
// 如果 organizationId 不为 null，清空 topOrganizationId，确保查询使用 organizationId
materialBaseInfoDO.setTopOrganizationId(null);
// 对于非2827组织，必须设置 topOrganizationId=2827
materialBaseInfoDO.setTopOrganizationId(2827L);
}
}
}
mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/pack/PackApplicationService.java
+2 -2
View File
@@ -81,8 +81,8 @@ public class PackApplicationService {
packDO.setTopOrganizationId(topOrganizationId);
}
} else {
// 如果 organizationId 不为 null，清空 topOrganizationId，确保查询使用 organizationId
packDO.setTopOrganizationId(null);
// 对于非2827组织，必须设置 topOrganizationId=2827
packDO.setTopOrganizationId(2827L);
}
}
}
mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/shipperLeaseDetails/ShipperLeaseDetailsApplicationService.java
+14 -7
View File
@@ -76,15 +76,22 @@ public class ShipperLeaseDetailsApplicationService {
shipperLeaseDetailsDO.setTopOrganizationId(null);
}
} else {
// 其他组织：设置organizationId，只查询当前组织的数据
if (topOrganizationId != null && topOrganizationId != 1){
shipperLeaseDetailsDO.setTopOrganizationId(topOrganizationId);
}
// 其他组织：设置organizationId为当前组织ID，并且设置topOrganizationId=2827
// 如果前端传递了organizationId，验证是否与当前登录用户的组织ID一致
if (shipperLeaseDetailsDO.getOrganizationId() != null && !shipperLeaseDetailsDO.getOrganizationId().equals(loginUserOrganizationId)) {
// 前端传递了其他组织的organizationId，强制使用当前登录用户的组织ID，防止越权查询
shipperLeaseDetailsDO.setOrganizationId(loginUserOrganizationId);
Long frontendOrganizationId = shipperLeaseDetailsDO.getOrganizationId();
if (frontendOrganizationId != null && loginUserOrganizationId != null) {
if (!frontendOrganizationId.equals(loginUserOrganizationId)) {
// 前端传递了其他组织的organizationId，强制使用当前登录用户的组织ID，防止越权查询
shipperLeaseDetailsDO.setOrganizationId(loginUserOrganizationId);
}
} else {
// 前端没有传递 organizationId，使用当前登录用户的组织ID
if (loginUserOrganizationId != null) {
shipperLeaseDetailsDO.setOrganizationId(loginUserOrganizationId);
}
}
// 对于非2827组织，必须设置 topOrganizationId=2827
shipperLeaseDetailsDO.setTopOrganizationId(2827L);
}
}
return shipperLeaseDetailsDomainService.queryList(shipperLeaseDetailsDO);
mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/storageLocation/StorageLocationApplicationService.java
+2 -2
View File
@@ -87,8 +87,8 @@ public class StorageLocationApplicationService {
storageLocationDO.setTopOrganizationId(topOrganizationId);
}
} else {
// 如果 organizationId 不为 null，清空 topOrganizationId，确保查询使用 organizationId
storageLocationDO.setTopOrganizationId(null);
// 对于非2827组织，必须设置 topOrganizationId=2827
storageLocationDO.setTopOrganizationId(2827L);
}
}
mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/storageLocationGroup/StorageLocationGroupApplicationService.java
+2 -2
View File
@@ -71,8 +71,8 @@ public class StorageLocationGroupApplicationService {
storageLocationGroupDO.setTopOrganizationId(topOrganizationId);
}
} else {
// 如果 organizationId 不为 null，清空 topOrganizationId，确保查询使用 organizationId
storageLocationGroupDO.setTopOrganizationId(null);
// 对于非2827组织，必须设置 topOrganizationId=2827
storageLocationGroupDO.setTopOrganizationId(2827L);
}
}
}
mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/storageSection/StorageSectionApplicationService.java
+2 -2
View File
@@ -86,8 +86,8 @@ public class StorageSectionApplicationService {
storageSectionDO.setTopOrganizationId(topOrganizationId);
}
} else {
// 如果 organizationId 不为 null，清空 topOrganizationId，确保查询使用 organizationId
storageSectionDO.setTopOrganizationId(null);
// 对于非2827组织，必须设置 topOrganizationId=2827
storageSectionDO.setTopOrganizationId(2827L);
}
}
}
mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/warehouse/WarehouseApplicationService.java
+2 -2
View File
@@ -85,8 +85,8 @@ public class WarehouseApplicationService {
warehouseDO.setTopOrganizationId(topOrganizationId);
}
} else {
// 如果 organizationId 不为 null，清空 topOrganizationId，确保查询使用 organizationId
warehouseDO.setTopOrganizationId(null);
// 对于非2827组织，必须设置 topOrganizationId=2827
warehouseDO.setTopOrganizationId(2827L);
}
}
}
mhd-modules/mhd-system/src/main/resources/mapper/basic/ContractManageMapper.xml
+6
View File
@@ -187,6 +187,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND date_format(effective_date,'%Y-%m-%d') <![CDATA[<=]]> #{contractManageDO.nowDateString}
)
</if>
<if test="contractManageDO.organizationId != null">
and organization_id = #{contractManageDO.organizationId}
</if>
<if test="contractManageDO.topOrganizationId != null">
and top_organization_id = #{contractManageDO.topOrganizationId}
</if>
</sql>
</mapper>
mhd_bms/src/main/java/com/mhd/bms/application/server/billManage/BillManageApplicationService.java
+2 -2
View File
@@ -116,8 +116,8 @@ public class BillManageApplicationService {
billManageDO.setTopOrganizationId(topOrganizationId);
}
} else {
// 如果 organizationId 不为 null，清空 topOrganizationId，确保查询使用 organizationId
billManageDO.setTopOrganizationId(null);
// 对于非2827组织，必须设置 topOrganizationId=2827
billManageDO.setTopOrganizationId(2827L);
}
}
}
mhd_bms/src/main/java/com/mhd/bms/application/server/billingStatement/BillingStatementApplicationService.java
+4 -4
View File
@@ -110,8 +110,8 @@ public class BillingStatementApplicationService {
billingStatementDO.setTopOrganizationId(topOrganizationId);
}
} else {
// 如果 organizationId 不为 null，清空 topOrganizationId，确保查询使用 organizationId
billingStatementDO.setTopOrganizationId(null);
// 对于非2827组织，必须设置 topOrganizationId=2827
billingStatementDO.setTopOrganizationId(2827L);
}
}
}
@@ -162,8 +162,8 @@ public class BillingStatementApplicationService {
billingStatementCollectDO.setTopOrganizationId(topOrganizationId);
}
} else {
// 如果 organizationId 不为 null，清空 topOrganizationId，确保查询使用 organizationId
billingStatementCollectDO.setTopOrganizationId(null);
// 对于非2827组织，必须设置 topOrganizationId=2827
billingStatementCollectDO.setTopOrganizationId(2827L);
}
}
}
mhd_bms/src/main/java/com/mhd/bms/application/server/businessDocument/BusinessDocumentApplicationService.java
+2 -2
View File
@@ -123,8 +123,8 @@ public class BusinessDocumentApplicationService {
businessDocumentDO.setTopOrganizationId(topOrganizationId);
}
} else {
// 如果 organizationId 不为 null，清空 topOrganizationId，确保查询使用 organizationId
businessDocumentDO.setTopOrganizationId(null);
// 对于非2827组织，必须设置 topOrganizationId=2827
businessDocumentDO.setTopOrganizationId(2827L);
}
}
}
mhd_bms/src/main/java/com/mhd/bms/application/server/paymentOrder/PaymentOrderApplicationService.java
+42 -4
View File
@@ -40,10 +40,48 @@ public class PaymentOrderApplicationService {
public List<PaymentOrderPO> queryList(PaymentOrderDO paymentOrderDO) {
LoginUser loginUser = SecurityUtils.getLoginUser();
if (loginUser != null){
Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId();
if (topOrganizationId != null && topOrganizationId != 1){
paymentOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
if (loginUser != null && loginUser.getUserPo() != null) {
Long userOrganizationId = loginUser.getUserPo().getOrganizationId();
Long frontendOrganizationId = paymentOrderDO.getOrganizationId(); // 前端传递的 organizationId
// 当前登录用户的 organizationId 为 2827 时，可查全部组织数据；其他组织只能查自己
if (userOrganizationId != null && userOrganizationId == 2827L) {
// 南光组织（organizationId=2827）：可以查询所有组织的数据
if (frontendOrganizationId != null) {
// 前端传递了 organizationId（包括2827或其他组织），使用前端传递的值进行过滤
paymentOrderDO.setOrganizationId(frontendOrganizationId);
paymentOrderDO.setTopOrganizationId(null); // 明确设置为 null，避免使用 topOrganizationId 条件
} else {
// 前端没有传递 organizationId，清空组织过滤条件，查询所有组织的数据
paymentOrderDO.setOrganizationId(null);
paymentOrderDO.setTopOrganizationId(null);
}
} else {
// 其他组织：设置organizationId，只查询当前组织的数据
// 如果前端传递了 organizationId，验证是否与当前登录用户的组织ID一致
if (frontendOrganizationId != null && userOrganizationId != null) {
// 前端传递了 organizationId，验证是否与当前登录用户的组织ID一致
if (!frontendOrganizationId.equals(userOrganizationId)) {
// 前端传递了其他组织的 organizationId，强制使用当前登录用户的组织ID，防止越权查询
paymentOrderDO.setOrganizationId(userOrganizationId);
}
// 如果前端传递的 organizationId 与当前登录用户的组织ID一致，使用前端传递的值
} else {
// 前端没有传递 organizationId，使用当前登录用户的组织ID
if (userOrganizationId != null) {
paymentOrderDO.setOrganizationId(userOrganizationId);
}
}
// 如果 organizationId 不为 null，则优先使用 organizationId，不使用 topOrganizationId
if (paymentOrderDO.getOrganizationId() == null) {
Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId();
if (topOrganizationId != null && topOrganizationId != 1) {
paymentOrderDO.setTopOrganizationId(topOrganizationId);
}
} else {
// 对于非2827组织，必须设置 topOrganizationId=2827
paymentOrderDO.setTopOrganizationId(2827L);
}
}
}
return paymentOrderDomainService.queryList(paymentOrderDO);
mhd_bms/src/main/java/com/mhd/bms/application/server/receiptManage/ReceiptManageApplicationService.java
+2 -2
View File
@@ -86,8 +86,8 @@ public class ReceiptManageApplicationService {
receiptManageDO.setTopOrganizationId(topOrganizationId);
}
} else {
// 如果 organizationId 不为 null，清空 topOrganizationId，确保查询使用 organizationId
receiptManageDO.setTopOrganizationId(null);
// 对于非2827组织，必须设置 topOrganizationId=2827
receiptManageDO.setTopOrganizationId(2827L);
}
}
}
mhd_bms/src/main/java/com/mhd/bms/application/server/settlementCustomers/SettlementCustomersApplicationService.java
+34 -4
View File
@@ -72,10 +72,40 @@ public class SettlementCustomersApplicationService {
private void setTopOrganizationIdLogin(SettlementCustomersDO settlementCustomersDO){
LoginUser loginUser = SecurityUtils.getLoginUser();
if (loginUser != null){
Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId();
if (topOrganizationId != null && topOrganizationId != 1){
settlementCustomersDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
if (loginUser != null && loginUser.getUserPo() != null) {
Long userOrganizationId = loginUser.getUserPo().getOrganizationId();
Long frontendOrganizationId = settlementCustomersDO.getOrganizationId(); // 前端传递的 organizationId
// 当前登录用户的 organizationId 为 2827 时，可查全部组织数据；其他组织只能查自己且 topOrganizationId=2827
if (userOrganizationId != null && userOrganizationId == 2827L) {
// 南光组织（organizationId=2827）：可以查询所有组织的数据
if (frontendOrganizationId != null) {
// 前端传递了 organizationId（包括2827或其他组织），使用前端传递的值进行过滤
settlementCustomersDO.setOrganizationId(frontendOrganizationId);
settlementCustomersDO.setTopOrganizationId(null); // 明确设置为 null，避免使用 topOrganizationId 条件
} else {
// 前端没有传递 organizationId，清空组织过滤条件，查询所有组织的数据
settlementCustomersDO.setOrganizationId(null);
settlementCustomersDO.setTopOrganizationId(null);
}
} else {
// 其他组织：设置organizationId为当前组织ID，并且设置topOrganizationId=2827
// 如果前端传递了 organizationId，验证是否与当前登录用户的组织ID一致
if (frontendOrganizationId != null && userOrganizationId != null) {
// 前端传递了 organizationId，验证是否与当前登录用户的组织ID一致
if (!frontendOrganizationId.equals(userOrganizationId)) {
// 前端传递了其他组织的 organizationId，强制使用当前登录用户的组织ID，防止越权查询
settlementCustomersDO.setOrganizationId(userOrganizationId);
}
// 如果前端传递的 organizationId 与当前登录用户的组织ID一致，使用前端传递的值
} else {
// 前端没有传递 organizationId，使用当前登录用户的组织ID
if (userOrganizationId != null) {
settlementCustomersDO.setOrganizationId(userOrganizationId);
}
}
// 对于非2827组织，必须设置 topOrganizationId=2827
settlementCustomersDO.setTopOrganizationId(2827L);
}
}
}
mhd_bms/src/main/resources/mapper/PaymentOrderMapper.xml
+3
View File
@@ -34,6 +34,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<sql id="common_where">
<if test="paymentOrderDO.organizationId != null">
AND a.organization_id = #{paymentOrderDO.organizationId}
</if>
<if test="paymentOrderDO.topOrganizationId != null and paymentOrderDO.topOrganizationId != ''">
AND a.top_organization_id = #{paymentOrderDO.topOrganizationId}
</if>
mhd_bms/src/main/resources/mapper/SettlementCustomersMapper.xml
+3
View File
@@ -101,6 +101,9 @@
<if test="settlementCustomersDO.mainRole != null and settlementCustomersDO.mainRole != ''">
and main_role = #{settlementCustomersDO.mainRole}
</if>
<if test="settlementCustomersDO.organizationId != null">
and organization_id = #{settlementCustomersDO.organizationId}
</if>
<if test="settlementCustomersDO.topOrganizationId != null and settlementCustomersDO.topOrganizationId != ''">
and top_organization_id = #{settlementCustomersDO.topOrganizationId}
</if>
mhd_wms/src/main/java/com/mhd/wms/application/service/differentManage/DifferentManageApplicationService.java
+2 -2
View File
@@ -75,8 +75,8 @@ public class DifferentManageApplicationService {
differentManageDO.setTopOrganizationId(topOrganizationId);
}
} else {
// 如果 organizationId 不为 null，清空 topOrganizationId，确保查询使用 organizationId
differentManageDO.setTopOrganizationId(null);
// 对于非2827组织，必须设置 topOrganizationId=2827
differentManageDO.setTopOrganizationId(2827L);
}
}
AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid());
mhd_wms/src/main/java/com/mhd/wms/application/service/handoverTaskOrder/HandoverTaskOrderApplicationService.java
+2 -2
View File
@@ -106,8 +106,8 @@ public class HandoverTaskOrderApplicationService {
handoverTaskOrderDO.setTopOrganizationId(topOrganizationId);
}
} else {
// 如果 organizationId 不为 null，清空 topOrganizationId，确保查询使用 organizationId
handoverTaskOrderDO.setTopOrganizationId(null);
// 对于非2827组织，必须设置 topOrganizationId=2827
handoverTaskOrderDO.setTopOrganizationId(2827L);
}
}
AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid());
mhd_wms/src/main/java/com/mhd/wms/application/service/inventoryAdjustmentRecord/InventoryAdjustmentRecordApplicationService.java
+2 -2
View File
@@ -93,8 +93,8 @@ public class InventoryAdjustmentRecordApplicationService {
inventoryAdjustmentRecordDO.setTopOrganizationId(topOrganizationId);
}
} else {
// 如果 organizationId 不为 null，清空 topOrganizationId，确保查询使用 organizationId
inventoryAdjustmentRecordDO.setTopOrganizationId(null);
// 对于非2827组织，必须设置 topOrganizationId=2827
inventoryAdjustmentRecordDO.setTopOrganizationId(2827L);
}
}
AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid());
mhd_wms/src/main/java/com/mhd/wms/application/service/investigationManage/InvestigationManageApplicationService.java
+2 -2
View File
@@ -107,8 +107,8 @@ public class InvestigationManageApplicationService {
investigationManageDO.setTopOrganizationId(topOrganizationId);
}
} else {
// 如果 organizationId 不为 null，清空 topOrganizationId，确保查询使用 organizationId
investigationManageDO.setTopOrganizationId(null);
// 对于非2827组织，必须设置 topOrganizationId=2827
investigationManageDO.setTopOrganizationId(2827L);
}
}
AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid());
mhd_wms/src/main/java/com/mhd/wms/application/service/materialBaseInfo/MaterialBaseInfoApplicationService.java
+2 -2
View File
@@ -102,8 +102,8 @@ public class MaterialBaseInfoApplicationService {
materialBaseInfoDO.setTopOrganizationId(topOrganizationId);
}
} else {
// 如果 organizationId 不为 null，清空 topOrganizationId，确保查询使用 organizationId
materialBaseInfoDO.setTopOrganizationId(null);
// 对于非2827组织，必须设置 topOrganizationId=2827
materialBaseInfoDO.setTopOrganizationId(2827L);
}
}
}
mhd_wms/src/main/java/com/mhd/wms/application/service/materialInventory/MaterialInventoryApplicationService.java
+2 -2
View File
@@ -94,8 +94,8 @@ public class MaterialInventoryApplicationService {
materialInventoryDO.setTopOrganizationId(topOrganizationId);
}
} else {
// 如果 organizationId 不为 null，清空 topOrganizationId，确保查询使用 organizationId
materialInventoryDO.setTopOrganizationId(null);
// 对于非2827组织，必须设置 topOrganizationId=2827
materialInventoryDO.setTopOrganizationId(2827L);
}
}
// 前端有传warehouseId则优先使用传参；未传时才使用"用户关联仓库"作为默认值
mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java
+2 -2
View File
@@ -104,8 +104,8 @@ public class PickingOrderApplicationService {
pickingOrderDO.setTopOrganizationId(topOrganizationId);
}
} else {
// 如果 organizationId 不为 null，清空 topOrganizationId，确保查询使用 organizationId
pickingOrderDO.setTopOrganizationId(null);
// 对于非2827组织，必须设置 topOrganizationId=2827
pickingOrderDO.setTopOrganizationId(2827L);
}
}
}
mhd_wms/src/main/java/com/mhd/wms/application/service/shiftManage/ShiftManageApplicationService.java
+2 -2
View File
@@ -110,8 +110,8 @@ public class ShiftManageApplicationService {
shiftManageDO.setTopOrganizationId(topOrganizationId);
}
} else {
// 如果 organizationId 不为 null，清空 topOrganizationId，确保查询使用 organizationId
shiftManageDO.setTopOrganizationId(null);
// 对于非2827组织，必须设置 topOrganizationId=2827
shiftManageDO.setTopOrganizationId(2827L);
}
}
AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid());
mhd_wms/src/main/java/com/mhd/wms/application/service/statementStatistics/StatementStatisticsService.java
+2 -2
View File
@@ -96,8 +96,8 @@ public class StatementStatisticsService {
immediateInventoryDO.setTopOrganizationId(topOrganizationId);
}
} else {
// 如果 organizationId 不为 null，清空 topOrganizationId，确保查询使用 organizationId
immediateInventoryDO.setTopOrganizationId(null);
// 对于非2827组织，必须设置 topOrganizationId=2827
immediateInventoryDO.setTopOrganizationId(2827L);
}
}
// 只有在用户没有明确指定仓库参数时，才使用缓存中的仓库信息
mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java
+2 -2
View File
@@ -111,8 +111,8 @@ public class StockInOrderApplicationService {
stockInOrderDO.setTopOrganizationId(topOrganizationId);
}
} else {
// 如果 organizationId 不为 null，清空 topOrganizationId，确保查询使用 organizationId
stockInOrderDO.setTopOrganizationId(null);
// 对于非2827组织，必须设置 topOrganizationId=2827
stockInOrderDO.setTopOrganizationId(2827L);
}
}
// 前端有传warehouseId则优先使用传参；未传时才使用"用户关联仓库"作为默认值
mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java
+2 -2
View File
@@ -138,8 +138,8 @@ public class StockOutOrderApplicationService {
stockOutOrderDO.setTopOrganizationId(topOrganizationId);
}
} else {
// 如果 organizationId 不为 null，清空 topOrganizationId，确保查询使用 organizationId
stockOutOrderDO.setTopOrganizationId(null);
// 对于非2827组织，必须设置 topOrganizationId=2827
stockOutOrderDO.setTopOrganizationId(2827L);
}
}
}
mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutTaskOrder/StockOutTaskOrderApplicationService.java
+2 -2
View File
@@ -89,8 +89,8 @@ public class StockOutTaskOrderApplicationService {
stockOutTaskOrderDO.setTopOrganizationId(topOrganizationId);
}
} else {
// 如果 organizationId 不为 null，清空 topOrganizationId，确保查询使用 organizationId
stockOutTaskOrderDO.setTopOrganizationId(null);
// 对于非2827组织，必须设置 topOrganizationId=2827
stockOutTaskOrderDO.setTopOrganizationId(2827L);
}
}
AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid());
mhd_wms/src/main/java/com/mhd/wms/application/service/stockReceiptOrder/StockReceiptOrderApplicationService.java
+2 -2
View File
@@ -134,8 +134,8 @@ public class StockReceiptOrderApplicationService {
stockReceiptOrderDO.setTopOrganizationId(topOrganizationId);
}
} else {
// 如果 organizationId 不为 null，清空 topOrganizationId，确保查询使用 organizationId
stockReceiptOrderDO.setTopOrganizationId(null);
// 对于非2827组织，必须设置 topOrganizationId=2827
stockReceiptOrderDO.setTopOrganizationId(2827L);
}
}
try {
mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java
+2 -2
View File
@@ -140,8 +140,8 @@ public class StockShelfOrderApplicationService {
stockShelfOrderDO.setTopOrganizationId(topOrganizationId);
}
} else {
// 如果 organizationId 不为 null，清空 topOrganizationId，确保查询使用 organizationId
stockShelfOrderDO.setTopOrganizationId(null);
// 对于非2827组织，必须设置 topOrganizationId=2827
stockShelfOrderDO.setTopOrganizationId(2827L);
}
}
try {