From bd59c19c6fccfc8d0bf3804c0d0c712454bd7d42 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 16 六月 2021 17:24:47 +0800
Subject: [PATCH] 修复扣款
---
java110-db/src/main/resources/mapper/community/MenuServiceDaoImplMapper.xml | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 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 91087aa..c6bb93e
--- a/java110-db/src/main/resources/mapper/community/MenuServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/MenuServiceDaoImplMapper.xml
@@ -8,9 +8,9 @@
<!-- 淇濆瓨璺敱淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
<insert id="saveMenuGroupInfo" parameterType="Map">
insert into m_menu_group(
- g_id,name,icon,label,seq,description,group_type
+ g_id,name,icon,label,seq,description,group_type,store_type
) values (
- #{gId},#{name},#{icon},#{label},#{seq},#{description},#{groupType}
+ #{gId},#{name},#{icon},#{label},#{seq},#{description},#{groupType},#{storeType}
)
</insert>
@@ -18,7 +18,7 @@
<!-- 鏌ヨ璺敱淇℃伅 add by wuxw 2018-07-03 -->
<select id="getMenuGroupInfo" parameterType="Map" resultType="Map">
- select t.g_id,t.name,t.icon,t.label,t.seq,t.description,t.g_id gId,t.group_type groupType
+ select t.g_id,t.name,t.icon,t.label,t.seq,t.description,t.g_id gId,t.group_type groupType,t.store_type storeType
from m_menu_group t
where t.status_cd= '0'
<if test="gId !=null and gId != ''">
@@ -35,6 +35,9 @@
</if>
<if test="groupType !=null and groupType != ''">
and t.group_type= #{groupType}
+ </if>
+ <if test="storeType !=null and storeType != ''">
+ and t.store_type= #{storeType}
</if>
<if test="seq !=null">
and t.seq= #{seq}
@@ -73,6 +76,9 @@
<if test="seq !=null ">
t.seq= #{seq},
</if>
+ <if test="storeType !=null and storeType != ''">
+ t.store_type= #{storeType},
+ </if>
<if test="description !=null and description != ''">
t.description= #{description}
</if>
@@ -85,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>
@@ -106,6 +112,9 @@
</if>
<if test="seq !=null">
and t.seq= #{seq}
+ </if>
+ <if test="storeType !=null and storeType != ''">
+ and t.store_type= #{storeType}
</if>
<if test="description !=null and description != ''">
and t.description= #{description}
@@ -137,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}
@@ -244,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>
@@ -307,7 +319,7 @@
AND ppr.status_cd = '0'
)
</if>
- order by t.seq asc
+ order by t.m_id desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
@@ -350,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