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 ${ew.sqlSegment} 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 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 page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.purGoodsListPage(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null);