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

Merge branch 'dev_qinhongzhanWMS' into wms_dev

Browse Source
This commit is contained in:
秦鸿展
2026-02-05 16:46:34 +08:00
parent 46f53855f9 14dcecb5d4
commit 532d163f7a
2 changed files with 4 additions and 4 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/warehouse/WarehouseApplicationService.java
+3 -3
View File
@@ -43,9 +43,9 @@ public class WarehouseApplicationService {
public List<WarehousePO> queryList(WarehouseDO warehouseDO) { public List<WarehousePO> queryList(WarehouseDO warehouseDO) {
LoginUser loginUser = SecurityUtils.getLoginUser(); LoginUser loginUser = SecurityUtils.getLoginUser();
if (loginUser != null){ if (loginUser != null){
Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId(); Long organizationId = loginUser.getUserPo().getOrganizationId();
if (topOrganizationId != null && topOrganizationId != 1){ if (organizationId != null && organizationId != 1){
warehouseDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId()); warehouseDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
} }
} }
return warehouseDomainService.queryList(warehouseDO); return warehouseDomainService.queryList(warehouseDO);
mhd-modules/mhd-system/src/main/resources/mapper/basic/warehouse/WarehouseMapper.xml
+1 -1
View File
@@ -58,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and top_organization_id = #{topOrganizationId} and top_organization_id = #{topOrganizationId}
</if> </if>
<if test="warehouseCode != null and warehouseCode != ''"> <if test="warehouseCode != null and warehouseCode != ''">
and warehouse_code = #{warehouseCode} and warehouse_code like concat('%', #{warehouseCode}, '%')
</if> </if>
<if test="warehouseName != null and warehouseName != ''"> <if test="warehouseName != null and warehouseName != ''">
and warehouse_name like concat('%', #{warehouseName}, '%') and warehouse_name like concat('%', #{warehouseName}, '%')