From 261609854ff8c912d70b12809153f1efc28e76ce Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 11 三月 2019 17:21:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/GoodsClassMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/GoodsClassMapper.xml
index a4bcd66..4b5d74b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/GoodsClassMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/GoodsClassMapper.xml
@@ -26,7 +26,14 @@
 	
 	<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">
 		select * from yeshi_ec_class where id = #{id,jdbcType=BIGINT}
- 	 </select>
-	
+ 	</select>
+ 	
+ 	<select id="listGoodsClassBySystemId" resultMap="BaseResultMap">
+ 		SELECT c.id,c.name,c.picture,c.url FROM `yeshi_ec_class` c
+		RIGHT JOIN `yeshi_ec_super_goodsclass` sp ON sp.`goodsclass_id` = c.`id`
+		WHERE sp.`system_id` = #{systemId}
+		ORDER BY c.`orderby`
+ 	</select>
+ 	
 	
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0