From e3bd667ab5aab92bcf8ef44f11d7d22f28b30413 Mon Sep 17 00:00:00 2001
From: xyiege <xyiege@gmail.com>
Date: Fri, 28 Oct 2022 10:27:41 +0800
Subject: [PATCH] =?UTF-8?q?api=E6=90=9C=E7=B4=A2=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=E8=AF=A6=E6=83=85=E9=80=BB=E8=BE=91=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/chjyj/szwh/controller/api/GoodsController.java    | 4 ++--
 .../cn/chjyj/szwh/service/impl/GoodsServiceImpl.java     | 2 ++
 src/main/resources/mapper/szwh/GoodsMapper.xml           | 9 ++++++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/java/cn/chjyj/szwh/controller/api/GoodsController.java b/src/main/java/cn/chjyj/szwh/controller/api/GoodsController.java
index 23fdfad..a7cb85d 100644
--- a/src/main/java/cn/chjyj/szwh/controller/api/GoodsController.java
+++ b/src/main/java/cn/chjyj/szwh/controller/api/GoodsController.java
@@ -147,8 +147,8 @@ public class GoodsController extends BaseController {
         }
         // goods islicode
         String goodsIsliCode = request.getParameter("goods_islicode");
-        if(StringUtils.isNotBlank(goodsIsliCode) && qmap.size()==0){
-            qmap.put("gisli",goodsIsliCode);
+        if(StringUtils.isNotBlank(goodsIsliCode) && qmap.size()==1){
+            qmap.put("g.gisli",goodsIsliCode);
         }
         // 系统标识，必须字段，不能为空
         String appkey=request.getParameter("appkey");
diff --git a/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java
index 99d7af1..31b3b04 100644
--- a/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java
+++ b/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java
@@ -185,6 +185,8 @@ public class GoodsServiceImpl implements GoodsService {
                         orderkey="gd.price";
                         break;
                 }
+            }else{
+                gmap.remove("orderway");
             }
         }
 
diff --git a/src/main/resources/mapper/szwh/GoodsMapper.xml b/src/main/resources/mapper/szwh/GoodsMapper.xml
index 69c30cf..557da23 100644
--- a/src/main/resources/mapper/szwh/GoodsMapper.xml
+++ b/src/main/resources/mapper/szwh/GoodsMapper.xml
@@ -71,7 +71,7 @@
             <if test="map!=null">
                 <foreach collection="map" item="v" index="k" separator="and">
                     <if test="v != null and v != '' and k!='orderway' and k!='id'
-                    and k!='gd.goods_name' and k!='g.entrust_name' and k!='gisli'
+                    and k!='gd.goods_name' and k!='g.entrust_name' and k!='g.gisli'
                      and k!='createtime' and k!='ishow'">
                         ${k} = #{v}
                     </if>
@@ -82,7 +82,7 @@
                         gd.goods_name like concat('%',#{v},'%')
                         OR g.goods_islicode like concat('%',#{v},'%')
                     </if>
-                    <if test="k=='gisli'">
+                    <if test="k=='g.gisli'">
                         g.goods_islicode=#{v}
                     </if>
                     <if test="k=='g.entrust_name'">
@@ -110,7 +110,7 @@
                 <if test="map!=null">
                     <foreach collection="map" item="v" index="k" separator="and">
                         <if test="v != null and v != '' and k!='orderway' and k!='id' and k!='gd.goods_name'
-                         and k!='g.entrust_name' and k!='createtime'
+                         and k!='g.entrust_name' and k!='createtime' and k!='g.gisli'
                          and k!='ishow'">
                             ${k} = #{v}
                         </if>
@@ -124,6 +124,9 @@
                         <if test="k=='g.entrust_name'">
                             g.username like concat('%',#{v},'%')
                         </if>
+                        <if test="k=='g.gisli'">
+                            g.goods_islicode=#{v}
+                        </if>
                         <if test="k=='createtime'">
                             ${v}
                         </if>