From 62dafd52def3b8adaeac589db3065f7a05d95925 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Fri, 19 Jul 2024 09:21:10 +0800 Subject: [PATCH] 7/19 --- .../warehouse/biz/warehousearea/WarehouseAreaMapper.xml | 2 +- .../warehouse/biz/warehousearea/WarehouseAreaService.java | 7 ++++--- .../biz/warehouseareatype/WarehouseAreaTypeMapper.xml | 2 +- .../biz/warehouseareatype/WarehouseAreaTypeService.java | 4 +--- .../warehouse/biz/warehouseinfo/WarehouseInfoMapper.xml | 2 +- .../warehouse/biz/warehouseinfo/WarehouseInfoService.java | 7 ++++--- .../warehouse/biz/warehouserack/WarehouseRackMapper.xml | 2 +- .../warehouse/biz/warehouserack/WarehouseRackService.java | 4 +--- .../biz/warehouseregion/WarehouseRegionMapper.xml | 2 +- .../biz/warehouseregion/WarehouseRegionService.java | 4 +--- 10 files changed, 16 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaMapper.xml index 24cc6d5..fc3d2db 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaMapper.xml +++ b/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaMapper.xml @@ -21,7 +21,7 @@ from warehouse_area a LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid - s.orgSidPath like #{orgPath} and a.isDelete !='1' + s.orgSidPath like concat('%',#{orgPath},'%') and a.isDelete !='1' diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java index 881c378..9199772 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java @@ -91,6 +91,9 @@ public class WarehouseInfoService extends MybatisBaseService saveOrUpdate(WarehouseInfoDto dto) { ResultBean rb = ResultBean.fireFail(); String sid = ""; + if(StringUtils.isBlank(dto.getTelephone())){ + + } if (StringUtils.isNotBlank(dto.getSid())) { sid = dto.getSid(); WarehouseInfo wmsWarehouse = fetchBySid(dto.getSid()); @@ -110,8 +113,7 @@ public class WarehouseInfoService extends MybatisBaseService - s.orgSidPath like #{orgPath} and a.isDelete !='1' + s.orgSidPath like concat('%',#{orgPath},'%') and a.isDelete !='1' diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionService.java b/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionService.java index b5cc6c4..ece3d28 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionService.java @@ -85,8 +85,7 @@ public class WarehouseRegionService extends MybatisBaseService