From 127e4c1ac5dca80ba65a908667530533c3af16f3 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Fri, 12 Jul 2024 17:59:32 +0800
Subject: [PATCH] 7/12

---
 .../biz/warehousearea/WarehouseAreaMapper.xml |  1 +
 .../warehousearea/WarehouseAreaService.java   |  6 +++---
 .../WarehouseAreaTypeMapper.xml               |  1 +
 .../WarehouseAreaTypeService.java             |  6 +++---
 .../biz/warehouseinfo/WarehouseInfoDto.java   |  1 +
 .../biz/warehouseinfo/WarehouseInfoMapper.xml |  5 +++--
 .../warehouseinfo/WarehouseInfoService.java   | 19 ++++++++++---------
 .../biz/warehouserack/WarehouseRackMapper.xml |  1 +
 .../warehouserack/WarehouseRackService.java   |  6 +++---
 9 files changed, 26 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 5b09a5b..bb74688 100644
--- a/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaMapper.xml
+++ b/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaMapper.xml
@@ -10,6 +10,7 @@
         from warehouse_area a
         left join warehouse_info b on b.sid=a.warehouseSid
         left join warehouse_area_type c on c.sid =a.areaTypeSid
+        LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid
         <where>
             ${ew.sqlSegment}
         </where>
diff --git a/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaService.java b/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaService.java
index d4d4602..bbaa27c 100644
--- a/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaService.java
+++ b/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaService.java
@@ -38,13 +38,13 @@ public class WarehouseAreaService extends MybatisBaseService<WarehouseAreaMapper
             int index=query.getIndex();
             if ("1".equals(orgLevelKey)) {
                 orgSidPath = orgSidPath.substring(0, index);
-                qw.like("a.useOrgSid", orgSidPath);
+                qw.like("s.orgSidPath", orgSidPath);
             } else if ("2".equals(orgLevelKey)) {
                 orgSidPath = orgSidPath.substring(0, index);
-                qw.like("a.useOrgSid", orgSidPath);
+                qw.like("s.orgSidPath", orgSidPath);
             } else if ("3".equals(orgLevelKey)) {
                 orgSidPath = orgSidPath.substring(0, index);
-                qw.apply("a.useOrgSid like('"+orgSidPath+"%')");
+                qw.apply("s.orgSidPath like('"+orgSidPath+"')");
             } else if ("4".equals(orgLevelKey)) {
                 qw.eq("a.createBySid", query.getUserSid());
             } else {
diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeMapper.xml
index 83a69e4..78e9f25 100644
--- a/src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeMapper.xml
+++ b/src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeMapper.xml
@@ -8,6 +8,7 @@
         select
             a.*
         from warehouse_area_type a
+        LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid
         <where>
             ${ew.sqlSegment}
         </where>
diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeService.java b/src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeService.java
index fcc30b8..534386d 100644
--- a/src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeService.java
+++ b/src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeService.java
@@ -38,13 +38,13 @@ public class WarehouseAreaTypeService extends MybatisBaseService<WarehouseAreaTy
             int index=query.getIndex();
             if ("1".equals(orgLevelKey)) {
                 orgSidPath = orgSidPath.substring(0, index);
-                qw.like("a.useOrgSid", orgSidPath);
+                qw.like("s.orgSidPath", orgSidPath);
             } else if ("2".equals(orgLevelKey)) {
                 orgSidPath = orgSidPath.substring(0, index);
-                qw.like("a.useOrgSid", orgSidPath);
+                qw.like("s.orgSidPath", orgSidPath);
             } else if ("3".equals(orgLevelKey)) {
                 orgSidPath = orgSidPath.substring(0, index);
-                qw.apply("a.useOrgSid like('"+orgSidPath+"%')");
+                qw.apply("s.orgSidPath like('"+orgSidPath+"')");
             } else if ("4".equals(orgLevelKey)) {
                 qw.eq("a.createBySid", query.getUserSid());
             } else {
diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoDto.java b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoDto.java
index 8f02013..3f97aa2 100644
--- a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoDto.java
+++ b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoDto.java
@@ -43,4 +43,5 @@ public class WarehouseInfoDto implements Dto {
     private String createOrgSid;//创建组织sid
 //    private List<WmsWarehouseExtendDto> wmsWarehouseExtendDtos;
     private WarehouseExtendDto wmsWarehouseExtendDto;
+    private String userSid;
 }
diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.xml
index 0fe3d23..0975303 100644
--- a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.xml
+++ b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.xml
@@ -6,8 +6,9 @@
 
     <select id="listPage" resultType="com.yxt.warehouse.biz.warehouseinfo.WarehouseInfoVo">
         select
-        *
-        from warehouse_info
+        a.*
+        from warehouse_info a
+        LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid
         <where>
             ${ew.sqlSegment}
         </where>
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 bd0d8fd..70e552f 100644
--- a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java
+++ b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java
@@ -47,15 +47,15 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
             int index=query.getIndex();
             if ("1".equals(orgLevelKey)) {
                 orgSidPath = orgSidPath.substring(0, index);
-                qw.like("useOrgSid", orgSidPath);
+                qw.like("s.orgSidPath", orgSidPath);
             } else if ("2".equals(orgLevelKey)) {
                 orgSidPath = orgSidPath.substring(0, index);
-                qw.like("useOrgSid", orgSidPath);
+                qw.like("s.orgSidPath", orgSidPath);
             } else if ("3".equals(orgLevelKey)) {
                 orgSidPath = orgSidPath.substring(0, index);
-                qw.apply("useOrgSid like('"+orgSidPath+"')");
+                qw.apply("s.orgSidPath like('"+orgSidPath+"')");
             } else if ("4".equals(orgLevelKey)) {
-                qw.eq("createBySid", query.getUserSid());
+                qw.eq("a.createBySid", query.getUserSid());
             } else {
                 PagerVo<WarehouseInfoVo> p = new PagerVo<>();
                 return rb.success().setData(p);
@@ -65,16 +65,16 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
             return rb.success().setData(p);
         }
         if (StringUtils.isNotBlank(query.getName())) {
-            qw.like("warehouseName", query.getName());
+            qw.like("a.warehouseName", query.getName());
         }
         if (StringUtils.isNotBlank(query.getCode())) {
-            qw.like("warehouseCode", query.getCode());
+            qw.like("a.warehouseCode", query.getCode());
         }
         if (StringUtils.isNotBlank(query.getAddress())) {
-            qw.like("address", query.getAddress());
+            qw.like("a.address", query.getAddress());
         }
-        qw.ne("isDelete",1);
-        qw.orderByDesc("sortNo");
+        qw.ne("a.isDelete",1);
+        qw.orderByDesc("a.sortNo");
         IPage<WarehouseInfo> page = PagerUtil.queryToPage(pq);
         IPage<WarehouseInfoVo> pagging = baseMapper.listPage(page, qw);
         PagerVo<WarehouseInfoVo> p = PagerUtil.pageToVo(pagging, null);
@@ -108,6 +108,7 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
             sid = wmsWarehouse.getSid();
             BeanUtil.copyProperties(dto, wmsWarehouse, "id", "sid");
             wmsWarehouse.setCreateTime(new DateTime());
+            wmsWarehouse.setCreateOrgSid(dto.getUserSid());
             baseMapper.insert(wmsWarehouse);
 //            for (WmsWarehouseExtendDto wmsWarehouseExtendDto : dto.getWmsWarehouseExtendDtos()) {
 //                wmsWarehouseExtendDto.setWarehouseSid(wmsWarehouse.getSid());
diff --git a/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackMapper.xml
index 76db5f7..5341835 100644
--- a/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackMapper.xml
+++ b/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackMapper.xml
@@ -10,6 +10,7 @@
         from warehouse_rack a
         left join warehouse_area b on b.sid =a.locationSid
         left join warehouse_info c on c.sid = a.warehouseSid
+        LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid
         <where>
             ${ew.sqlSegment}
         </where>
diff --git a/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackService.java b/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackService.java
index b2e2e7a..08386e3 100644
--- a/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackService.java
+++ b/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackService.java
@@ -38,13 +38,13 @@ public class WarehouseRackService extends MybatisBaseService<WarehouseRackMapper
             int index=query.getIndex();
             if ("1".equals(orgLevelKey)) {
                 orgSidPath = orgSidPath.substring(0, index);
-                qw.like("a.useOrgSid", orgSidPath);
+                qw.like("s.orgSidPath", orgSidPath);
             } else if ("2".equals(orgLevelKey)) {
                 orgSidPath = orgSidPath.substring(0, index);
-                qw.like("a.useOrgSid", orgSidPath);
+                qw.like("s.orgSidPath", orgSidPath);
             } else if ("3".equals(orgLevelKey)) {
                 orgSidPath = orgSidPath.substring(0, index);
-                qw.apply("a.useOrgSid like('"+orgSidPath+"%')");
+                qw.apply("s.orgSidPath like('"+orgSidPath+"')");
             } else if ("4".equals(orgLevelKey)) {
                 qw.eq("a.createBySid", query.getUserSid());
             } else {