From e4a56b57d3e10b9b46eaefe5194bbf98fcc45698 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 11 七月 2019 18:41:09 +0800
Subject: [PATCH] Merge branch 'master' into div

---
 fanli/src/main/java/com/yeshi/fanli/mapping/user/UserGoodsStorageMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserGoodsStorageMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserGoodsStorageMapper.xml
index 3decfee..cc49cfa 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserGoodsStorageMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserGoodsStorageMapper.xml
@@ -105,7 +105,7 @@
    
    <select id="countQueryByUid" resultType="java.lang.Long">
 	 SELECT IFNULL(count(guc_id),0) FROM yeshi_ec_user_goods_storage  tg
-	  LEFT JOIN  `yeshi_ec_common_goods` cg ON tg.`guc_common_id` = cg.`cg_id`
+	  <if test="gooodsType != null"> LEFT JOIN  `yeshi_ec_common_goods` cg ON tg.`guc_common_id` = cg.`cg_id`</if>
 	 WHERE tg.`guc_uid` = #{uid} <if test="gooodsType != null">AND cg.cg_goods_type = #{gooodsType}</if>
    </select>
   

--
Gitblit v1.8.0