From 62b6a7fac3f2acde70b578431147c4a01f19c182 Mon Sep 17 00:00:00 2001
From: 黎星凯 <13949086503@163.com>
Date: 星期一, 15 四月 2024 09:07:05 +0800
Subject: [PATCH] bug修改

---
 consum-base/src/main/java/com/consum/base/service/impl/BaseGoodsTemplateServiceImpl.java |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/consum-base/src/main/java/com/consum/base/service/impl/BaseGoodsTemplateServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/BaseGoodsTemplateServiceImpl.java
index 6a47513..aa72f33 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/BaseGoodsTemplateServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/BaseGoodsTemplateServiceImpl.java
@@ -27,6 +27,7 @@
 import com.walker.infrastructure.utils.DateUtils;
 import com.walker.infrastructure.utils.StringUtils;
 import com.walker.jdbc.service.BaseServiceImpl;
+import java.util.Collections;
 
 import cn.hutool.core.convert.Convert;
 
@@ -58,8 +59,8 @@
 
         // 鍒嗙被id
         if (categoryId != null) {
-            sql.append(" and category_id =:category_id ");
-            paramts.put("category_id", categoryId);
+            sql.append(" and category_id =:categoryId ");
+            paramts.put("categoryId", categoryId);
         }
         sql.append(" and states =1 ");
 
@@ -256,7 +257,7 @@
      * @return
      */
 
-    private static String QUERY_GOODSINFO_BY_MODELID =
+    private static final String QUERY_GOODSINFO_BY_MODELID =
         "SELECT model.MODEL_NAME modelName,model.UNIT,temp.id goodsId, temp.GOODS_CODE goodsCode,temp.GOODS_NAME goodsName,temp.CLASSIFICATION classification,temp.CATEGORY_ID categoryId FROM BASE_GOODS_MODELS model LEFT JOIN BASE_GOODS_TEMPLATE temp ON model.GOODS_TEMPLATES_ID=temp.id WHERE 1=1 ";
 
     @Override
@@ -269,7 +270,7 @@
         }
         List<Map<String, Object>> tempGoodsInfo = this.select(sqlStr.toString(), params);
         if (CollectionUtils.isEmpty(tempGoodsInfo)) {
-            return null;
+            return Collections.emptyMap();
         }
         return tempGoodsInfo.get(0);
     }
@@ -334,7 +335,7 @@
      * @return
      */
     @Override
-    public List<BaseGoodsTemplate> queryGoodsTemplateByCategoryId(Long agencyId, Long categoryId, Short states,
+    public List<BaseGoodsTemplate> queryGoodsTemplateByCategoryId(Long agencyId, Long categoryId, Integer states,
         String goodsName) {
         StringBuilder sql = new StringBuilder("SELECT * FROM base_goods_template WHERE 1=1 ");
         Map<String, Object> params = new HashMap<>();

--
Gitblit v1.9.1