From 00a8e2f76d02cfc17ca9ff156aa97f85bae5897d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 09 Aug 2021 16:50:55 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

---
 gc-shop/src/main/resources/mapper/shop/ScoreGoodsCategoryMapper.xml |   25 ++++++++++++++++++++++---
 1 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/gc-shop/src/main/resources/mapper/shop/ScoreGoodsCategoryMapper.xml b/gc-shop/src/main/resources/mapper/shop/ScoreGoodsCategoryMapper.xml
index 8c67f58..13fd2f0 100644
--- a/gc-shop/src/main/resources/mapper/shop/ScoreGoodsCategoryMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/ScoreGoodsCategoryMapper.xml
@@ -2,14 +2,31 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xzx.gc.shop.mapper.ScoreGoodsCategoryMapper">
 
+    <resultMap id="goodsCategoryMap" type="com.xzx.gc.shop.vo.GoodsCategoryVo">
+        <id column="id" property="id" />
+        <result column="name" property="name" />
+        <collection property="children" ofType="com.xzx.gc.shop.vo.GoodsCategoryVo">
+            <id column="c_id" property="id" />
+            <result column="c_name" property="name" />
+        </collection>
+    </resultMap>
+
+    <select id="selectCategoryWithChildren" resultMap="goodsCategoryMap">
+        select a.id id, a.name name, b.id c_id, b.name c_name
+        from xzx_score_goods_category a
+        left join xzx_score_goods_category b on a.id=b.parent_id
+        where a.parent_id=0
+    </select>
+
     <select id="queryGoodsCategoryList" resultType="com.xzx.gc.shop.vo.QueryGoodsCategoryListVo">
         SELECT
-               *
+               a.*,
+        a.CREATED_TIME createTime
         FROM
         xzx_score_goods_category a
         WHERE 1 = 1
         <if test="record.name != null and record.name != ''">
-            and a.name=#{record.name}
+            and a.name like concat('%',#{record.name},'%')
         </if>
         <if test="record.categoryIden != null and record.categoryIden != ''">
             and a.category_iden=#{record.categoryIden}
@@ -22,7 +39,8 @@
 
     <select id="viewGoodsCategoryOneList" resultType="com.xzx.gc.shop.vo.ViewGoodsCategoryListVo">
         SELECT
-        *
+        a.*,
+        a.CREATED_TIME createTime
         FROM
         xzx_score_goods_category a
         WHERE 1 = 1
@@ -32,6 +50,7 @@
     <select id="viewGoodsCategoryList" resultType="com.xzx.gc.shop.vo.ViewGoodsCategoryListVo">
         SELECT
             a.*,
+            a.CREATED_TIME createTime,
                (select name from xzx_score_goods_category where a.parent_id = id) parentName
         FROM
             xzx_score_goods_category a

--
Gitblit v1.9.1