From 3ce803d740ea1cb2358c74157dbc61878d34c22f Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Tue, 6 Aug 2024 11:20:06 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=95=86=E5=93=81=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=BD=93=E5=89=8D=E5=8D=95=E4=BD=8D=E4=B8=8B=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E5=AE=8C=E6=88=90=20=E9=80=89=E6=8B=A9=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E8=BF=94=E5=9B=9E=E6=9C=89=E6=95=88=E6=9C=9F=E5=92=8C?=
 =?UTF-8?q?=E7=A8=8E=E7=8E=87=EF=BC=8C=E4=BF=9D=E5=AD=98=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E5=8D=95=E4=BF=9D=E5=AD=98=E6=9C=89=E6=95=88=E6=9C=9F=E5=88=B0?=
 =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=95=86=E5=93=81=E6=98=8E=E7=BB=86=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/yxt/goods/biz/goodssku/GoodsSkuMapper.xml    | 2 --
 .../yxt/goods/biz/goodssku/GoodsSkuPurSelectQuery.java    | 6 +-----
 .../java/com/yxt/goods/biz/goodssku/GoodsSkuService.java  | 8 +-------
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuMapper.xml b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuMapper.xml
index c2d377a..0da3a36 100644
--- a/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuMapper.xml
+++ b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuMapper.xml
@@ -70,8 +70,6 @@
         ON a.sid = s.goodsSpuSid
         LEFT JOIN goods_sku_extend e
         ON s.sid = e.goodsSkuSid
-        LEFT JOIN ss_user.sys_organization o
-        ON a.useOrgSid = o.sid
         <where>
             ${ew.sqlSegment}
         </where>
diff --git a/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuPurSelectQuery.java b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuPurSelectQuery.java
index 1a5f133..a170f74 100644
--- a/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuPurSelectQuery.java
+++ b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuPurSelectQuery.java
@@ -15,10 +15,6 @@ public class GoodsSkuPurSelectQuery implements Query {
     private String goodsSkuCode;
     //商品名称
     private String goodsName;
-    //商品条码
-    private String barCode;
-    //规格名称
-    private String goodsSkuOwnSpec;
 
-    private String orgPath;
+    private String createOrgSid;
 }
diff --git a/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuService.java b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuService.java
index c00eedc..fb73923 100644
--- a/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuService.java
+++ b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuService.java
@@ -210,19 +210,13 @@ public class GoodsSkuService extends MybatisBaseService<GoodsSkuMapper, GoodsSku
         ResultBean rb = ResultBean.fireFail();
         GoodsSkuPurSelectQuery query = pq.getParams();
         QueryWrapper<GoodsSku> qw = new QueryWrapper<>();
-        qw.like("o.orgSidPath", query.getOrgPath());
+        qw.like("a.createOrgSid", query.getCreateOrgSid());
         if (StringUtils.isNotBlank(query.getGoodsSkuCode())) {
             qw.eq("s.goodsSkuCode", query.getGoodsSkuCode());
         }
         if (StringUtils.isNotBlank(query.getGoodsName())) {
             qw.like("s.title", query.getGoodsName());
         }
-        if (StringUtils.isNotBlank(query.getBarCode())) {
-            qw.like("a.barCode", query.getBarCode());
-        }
-        if (StringUtils.isNotBlank(query.getGoodsSkuOwnSpec())) {
-            qw.like("s.own_spec", query.getGoodsSkuOwnSpec());
-        }
         IPage<GoodsSku> page = PagerUtil.queryToPage(pq);
         IPage<GoodsSkuPurSelectList> pagging = baseMapper.purGoodsListPage(page, qw);
         PagerVo<GoodsSkuPurSelectList> p = PagerUtil.pageToVo(pagging, null);