完善商品查询接口

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuMapper.xml

@@ -63,7 +63,7 @@
     <select id="getGoodsListPage" resultType="com.yxt.base.biz.base.basegoodssku.GoodsSkuVo">
         select sku.sid       goodsSkuSid,
                spu.sid as    goodsSpuSid,
-               spu.goodsName goodsSpuName,
+               sku.title goodsSpuName,
                sku.goodsSkuCode,
                sku.indexes,
                spu.goodsUnitName,
@@ -74,4 +74,4 @@
             ${ew.sqlSegment}
         </where>
     </select>
-</mapper>
+</mapper>

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuService.java

@@ -222,12 +222,12 @@ public class BaseGoodsSkuService extends MybatisBaseService<BaseGoodsSkuMapper,
         GoodsSkuQuery query = pagerQuery.getParams();
         QueryWrapper<BaseGoodsSku> qw = new QueryWrapper<>();
         if (query != null) {
-            if (StringUtils.isNotBlank(query.getOrgSid())) {
-                qw.eq("spu.createOrgSid", query.getOrgSid());
+            if (StringUtils.isNotBlank(query.getUseOrgSid())) {
+                qw.eq("spu.useOrgSid", query.getUseOrgSid());
             }
             //商品名称
             if (StringUtils.isNotBlank(query.getGoodsSpuName())) {
-                qw.like("spu.goodsName", query.getGoodsSpuName());
+                qw.like("sku.title", query.getGoodsSpuName());
             }
             //商品编码
             if (StringUtils.isNotBlank(query.getGoodsSkuCode())) {

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/GoodsSkuQuery.java

@@ -21,5 +21,6 @@ public class GoodsSkuQuery implements Query {
     private String goodsSkuCode;
     @ApiModelProperty("厂家名称")
     private String manufacturerName;
-
+    @ApiModelProperty("部门sid")
+    private String useOrgSid;
 }