From b6449621674069409bfd2341e417f27575f50d8c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 16 Sep 2021 19:34:58 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall
---
src/main/resources/mapper/modules/MallGoodsCategoryMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallGoodsCategoryMapper.xml b/src/main/resources/mapper/modules/MallGoodsCategoryMapper.xml
index 6d2332d..a4e66bd 100644
--- a/src/main/resources/mapper/modules/MallGoodsCategoryMapper.xml
+++ b/src/main/resources/mapper/modules/MallGoodsCategoryMapper.xml
@@ -2,8 +2,8 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cc.mrbird.febs.mall.mapper.MallGoodsCategoryMapper">
- <select id="selectCategoryList" resultType="cc.mrbird.febs.mall.entity.MallGoodsCategory">
- SELECT m.name,b.name
+ <select id="selectCategoryListInPage" resultType="cc.mrbird.febs.mall.entity.MallGoodsCategory">
+ SELECT m.name,b.name parentName
FROM mall_goods_category m
left join mall_goods_category b on m.parent_id = b.id
<where>
@@ -13,7 +13,7 @@
</if>
</if>
</where>
- order by m.CREATED_TIME desc
+ order by m.parent_id asc
</select>
<select id="selectCategoryByName" resultType="cc.mrbird.febs.mall.entity.MallGoodsCategory">
@@ -21,7 +21,7 @@
</select>
<select id="getCategorys" resultType="cc.mrbird.febs.mall.entity.MallGoodsCategory">
- SELECT * FROM mall_goods_category m where m.parent_id is null
+ SELECT * FROM mall_goods_category m where m.parent_id = 0
</select>
<resultMap id="mallGoodsCategoryVoMap" type="cc.mrbird.febs.mall.vo.MallGoodsCategoryVo">
--
Gitblit v1.9.1