From a7a7823c648d3ab52052eaa9c663723322a9da79 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 20 八月 2021 19:04:50 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/community/MenuServiceDaoImplMapper.xml | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/MenuServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/MenuServiceDaoImplMapper.xml
index e66dc04..e84d4bf 100755
--- a/java110-db/src/main/resources/mapper/community/MenuServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/MenuServiceDaoImplMapper.xml
@@ -146,8 +146,9 @@
<!-- 鏌ヨ璺敱淇℃伅 add by wuxw 2018-07-03 -->
<select id="getBasePrivilegeInfo" parameterType="Map" resultType="Map">
- select t.p_id,t.name,t.domain,t.resource,t.description,t.p_id pId,t.create_time createTime
+ select t.p_id,t.name,t.domain,t.resource,t.description,t.p_id pId,t.create_time createTime,st.name stName
from p_privilege t
+ left join store_type st on t.domain=st.store_type_cd
where t.status_cd= '0'
<if test="pId !=null and pId != ''">
and t.p_id= #{pId}
@@ -318,7 +319,7 @@
AND ppr.status_cd = '0'
)
</if>
- order by t.m_id desc
+ order by t.seq
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
--
Gitblit v1.8.0