From 25c2295ffc68c71b549a3601536a07ef1c8e515b Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Fri, 28 Jun 2024 18:00:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=9C=81=E3=80=81=E5=B8=82?=
 =?UTF-8?q?=E3=80=81=E5=8E=BF=E6=8E=A5=E5=8F=A3=E8=BF=81=E7=A7=BB=20?=
 =?UTF-8?q?=E5=BA=93=E5=8C=BA=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yxt/warehouse/biz/warehousearea/WarehouseArea.java    | 1 +
 .../yxt/warehouse/biz/warehousearea/WarehouseAreaDto.java | 2 +-
 .../warehouse/biz/warehousearea/WarehouseAreaService.java | 8 ++++----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseArea.java b/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseArea.java
index 2ce3b7b..aaf986b 100644
--- a/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseArea.java
+++ b/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseArea.java
@@ -21,4 +21,5 @@ public class WarehouseArea extends BaseEntity {
     private String volume;//库位容量
     private String unit;//计量单位
     private String areaTypeSid;//货区类型
+    private String useOrgSid;
 }
diff --git a/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaDto.java b/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaDto.java
index f20a3a0..3ee58e4 100644
--- a/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaDto.java
+++ b/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaDto.java
@@ -24,5 +24,5 @@ public class WarehouseAreaDto implements Dto {
     private String volume;//库位容量
     private String unit;//计量单位
     private String areaTypeSid;//货区类型
-
+    private String useOrgSid;
 }
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 4d69ab4..a055347 100644
--- a/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaService.java
+++ b/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaService.java
@@ -53,10 +53,10 @@ public class WarehouseAreaService extends MybatisBaseService<WarehouseAreaMapper
                 qw.like("orgSidPath", orgSidPath);
             } else if ("5".equals(orgLevelKey)) {
                 qw.eq("createBySid", query.getUserSid());
-            } else {
+            } /*else {
                 PagerVo<WarehouseAreaVo> p = new PagerVo<>();
                 return rb.success().setData(p);
-            }
+            }*/
         }
 //        else {
 //            PagerVo<WarehouseAreaVo> p = new PagerVo<>();
@@ -75,9 +75,9 @@ public class WarehouseAreaService extends MybatisBaseService<WarehouseAreaMapper
             qw.eq("sid", query.getAreaTypeSid());
         }
         if (StringUtils.isNotBlank(query.getOrgPath())) {
-            qw.like("useOrgSid", query.getOrgPath());
+            qw.like("a.useOrgSid", query.getOrgPath());
         }
-        qw.ne("isDelete", "1");
+        qw.ne("a.isDelete", "1");
         IPage<WarehouseArea> page = PagerUtil.queryToPage(pq);
         IPage<WarehouseAreaVo> pagging = baseMapper.listPage(page, qw);
         PagerVo<WarehouseAreaVo> p = PagerUtil.pageToVo(pagging, null);