From ab6a423cf604b83f06b5768dbc162ece744a32d9 Mon Sep 17 00:00:00 2001
From: shane <88386378@qq.com>
Date: 星期五, 20 八月 2021 00:34:11 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/community/MenuServiceDaoImplMapper.xml | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/MenuServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/MenuServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index 1038951..e84d4bf
--- a/java110-db/src/main/resources/mapper/community/MenuServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/MenuServiceDaoImplMapper.xml
@@ -91,7 +91,7 @@
<select id="queryMenuGroupsCount" parameterType="Map" resultType="Map">
select count(1) count
from m_menu_group t
- where 1 =1
+ where t.status_cd= '0'
<if test="gId !=null and gId != ''">
and t.g_id= #{gId}
</if>
@@ -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}
@@ -253,11 +254,13 @@
<select id="getMenuInfo" parameterType="Map" resultType="Map">
select DISTINCT t.m_id mId,t.name,t.g_id gId,t.url,t.seq,t.p_id pId,t.description,t.is_show isShow,
if(t.is_show='Y','鏄剧ず','涓嶆樉绀�') isShowName,
- t.m_id pId,t.name pName
- from m_menu t,p_privilege p
+ t.m_id pId,t.name pName,mg.name menuGroupName,mg.store_type,st.name storeTypeName
+ from m_menu t,p_privilege p,m_menu_group mg,store_type st
where t.status_cd= '0'
and p.status_cd= '0'
and t.m_id = p.m_id
+ and t.g_id = mg.g_id
+ and mg.store_type = st.store_type_cd
<if test="gId !=null and gId != ''">
and t.g_id= #{gId}
</if>
@@ -316,7 +319,7 @@
AND ppr.status_cd = '0'
)
</if>
- order by t.seq asc
+ order by t.seq
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
@@ -359,10 +362,12 @@
<!-- 鏌ヨ璺敱鏁伴噺 add by wuxw 2018-07-03 -->
<select id="queryMenusCount" parameterType="Map" resultType="Map">
select count(DISTINCT(t.m_id)) count
- from m_menu t,p_privilege p
+ from m_menu t,p_privilege p,m_menu_group mg,store_type st
where t.status_cd= '0'
and p.status_cd= '0'
and t.m_id = p.m_id
+ and t.g_id = mg.g_id
+ and mg.store_type = st.store_type_cd
<if test="gId !=null and gId != ''">
and t.g_id= #{gId}
</if>
--
Gitblit v1.8.0