From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/community/MenuServiceDaoImplMapper.xml | 179 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 94 insertions(+), 85 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 96b8569..7e04a54
--- a/java110-db/src/main/resources/mapper/community/MenuServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/MenuServiceDaoImplMapper.xml
@@ -1,24 +1,17 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="menuServiceDaoImpl">
-
<!-- 淇濆瓨璺敱淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
<insert id="saveMenuGroupInfo" parameterType="Map">
- insert into m_menu_group(
- g_id,name,icon,label,seq,description
- ) values (
- #{gId},#{name},#{icon},#{label},#{seq},#{description}
- )
-
+ insert into m_menu_group(g_id, name, icon, label, seq, description, group_type, store_type)
+ values (#{gId}, #{name}, #{icon}, #{label}, #{seq}, #{description}, #{groupType}, #{storeType})
</insert>
-
<!-- 鏌ヨ璺敱淇℃伅 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
+ 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 != ''">
@@ -33,19 +26,23 @@
<if test="label !=null and label != ''">
and t.label= #{label}
</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}
</if>
<if test="description !=null and description != ''">
and t.description= #{description}
</if>
- order by t.create_time desc
+ order by t.seq desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
-
</select>
-
<!-- 淇敼璺敱淇℃伅 add by wuxw 2018-07-03 -->
<update id="updateMenuGroupInfo" parameterType="Map">
@@ -55,10 +52,13 @@
t.status_cd = #{statusCd},
</if>
<if test="name !=null and name != ''">
- t.name= #{name},
+ t.name= #{name},
</if>
<if test="icon !=null and icon != ''">
t.icon= #{icon},
+ </if>
+ <if test="groupType !=null and groupType != ''">
+ t.group_type= #{groupType},
</if>
<if test="label !=null ">
t.label= #{label},
@@ -66,19 +66,21 @@
<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>
</set>
where t.g_id= #{gId}
-
</update>
<!-- 鏌ヨ璺敱鏁伴噺 add by wuxw 2018-07-03 -->
<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>
@@ -87,6 +89,9 @@
</if>
<if test="icon !=null and icon != ''">
and t.icon= #{icon}
+ </if>
+ <if test="groupType !=null and groupType != ''">
+ and t.group_type= #{groupType}
</if>
<if test="statusCd !=null and statusCd != ''">
and t.status_cd= #{statusCd}
@@ -97,43 +102,31 @@
<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}
</if>
</select>
-
-
-
-
-
<!-- 淇濆瓨璺敱淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
<insert id="saveBasePrivilegeRelInfo" parameterType="Map">
- insert into p_privilege_rel(
- p_id,pg_id
- ) values (
- #{pId},#{pgId}
- )
-
+ insert into p_privilege_rel(p_id, pg_id)
+ values (#{pId}, #{pgId})
</insert>
-
-
<!-- 淇濆瓨璺敱淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
<insert id="saveBasePrivilegeInfo" parameterType="Map">
- insert into p_privilege(
- p_id,name,resource,domain,description,m_id
- ) values (
- #{pId},#{name},#{resource},#{domain},#{description},#{mId}
- )
-
+ insert into p_privilege(p_id, name, resource, domain, description, m_id)
+ values (#{pId}, #{name}, #{resource}, #{domain}, #{description}, #{mId})
</insert>
-
<!-- 鏌ヨ璺敱淇℃伅 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}
@@ -154,9 +147,7 @@
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
-
</select>
-
<!-- 淇敼璺敱淇℃伅 add by wuxw 2018-07-03 -->
<update id="updateBasePrivilegeInfo" parameterType="Map">
@@ -179,7 +170,6 @@
</if>
</set>
where t.p_id= #{pId}
-
</update>
<!-- 淇敼璺敱淇℃伅 add by wuxw 2018-07-03 -->
@@ -195,10 +185,7 @@
</set>
where t.p_id= #{pId}
-
</update>
-
-
<!-- 鏌ヨ璺敱鏁伴噺 add by wuxw 2018-07-03 -->
<select id="queryBasePrivilegesCount" parameterType="Map" resultType="Map">
@@ -225,29 +212,28 @@
</if>
</select>
-
-
<!-- 淇濆瓨璺敱淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
<insert id="saveMenuInfo" parameterType="Map">
- insert into m_menu(
- m_id,name,g_id,url,seq,p_id,description,is_show
- ) values (
- #{mId},#{name},#{gId},#{url},#{seq},'-1',#{description},#{isShow}
- )
+ insert into m_menu(m_id, name, g_id, url, seq, p_id, description, is_show)
+ values (#{mId}, #{name}, #{gId}, #{url}, #{seq}, '-1', #{description}, #{isShow})
</insert>
-
<!-- 鏌ヨ璺敱淇℃伅 add by wuxw 2018-07-03 -->
<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,
- p.p_id pId,t.name pName
- from m_menu t,p_privilege p
+ t.m_id pId,t.name pName,mg.name gName,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>
+ <if test="gName !=null and gName != ''">
+ and mg.name= #{gName}
</if>
<if test="name !=null and name != ''">
and t.name like concat('%',#{name},'%')
@@ -255,7 +241,6 @@
<if test="mName !=null and mName != ''">
and t.name like concat('%',#{mName},'%')
</if>
-
<if test="domain !=null and domain != ''">
and p.domain= #{domain}
</if>
@@ -304,17 +289,13 @@
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>
-
</select>
-
- <!-- 淇敼璺敱淇℃伅
- ,t.description,t.is_show isShow
- add by wuxw 2018-07-03 -->
+ <!-- 淇敼璺敱淇℃伅 add by wuxw 2018-07-03 -->
<update id="updateMenuInfo" parameterType="Map">
update m_menu t
<set>
@@ -341,18 +322,22 @@
</if>
</set>
where t.m_id= #{mId}
-
</update>
<!-- 鏌ヨ璺敱鏁伴噺 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>
+ <if test="gName !=null and gName != ''">
+ and mg.name= #{gName}
</if>
<if test="name !=null and name != ''">
and t.name like concat('%',#{name},'%')
@@ -361,7 +346,7 @@
and t.name like concat('%',#{mName},'%')
</if>
<if test="pId !=null and pId != ''">
- and t.p_id= #{pId}
+ and p.p_id= #{pId}
</if>
<if test="domain !=null and domain != ''">
and p.domain= #{domain}
@@ -371,9 +356,6 @@
</if>
<if test="mId !=null and mId != ''">
and p.m_id= #{mId}
- </if>
- <if test="pId !=null and pId != ''">
- and t.p_id= #{pId}
</if>
<if test="isShow !=null and isShow != ''">
and t.is_show= #{isShow}
@@ -415,25 +397,52 @@
<select id="checkUserHasResource" parameterType="Map" resultType="Map">
SELECT pp.*,'-1' AS pg_id,'' AS pg_name FROM p_privilege_user ppu,p_privilege pp
- WHERE ppu.`p_id` = pp.`p_id`
- AND pp.`resource` = #{resource}
- AND ppu.`privilege_flag` = '0'
- AND ppu.`user_id` = #{userId}
- AND ppu.`status_cd` = '0'
- AND pp.`status_cd` = '0'
+ WHERE ppu.`p_id` = pp.`p_id`
+ <if test="resource != null and resource != ''">
+ AND pp.`resource` = #{resource}
+ </if>
+ AND ppu.`privilege_flag` = '0'
+ AND ppu.`user_id` = #{userId}
+ AND ppu.`status_cd` = '0'
+ AND pp.`status_cd` = '0'
UNION
- SELECT pp.*,ppg.pg_id,ppg.name pg_name FROM p_privilege_user ppu,p_privilege_group ppg,p_privilege pp,p_privilege_rel ppr
- WHERE ppu.`p_id` = ppr.pg_id
- AND ppr.pg_id = ppg.pg_id
- AND ppr.p_id = pp.`p_id`
- AND pp.`resource` = #{resource}
- AND ppu.`privilege_flag` = '1'
- AND ppu.`user_id` = #{userId}
- AND ppu.`status_cd` = '0'
- AND pp.`status_cd` = '0'
- AND ppg.status_cd = '0'
- AND ppr.status_cd = '0'
+ SELECT pp.*,ppg.pg_id,ppg.name pg_name FROM p_privilege_user ppu,p_privilege_group ppg,p_privilege
+ pp,p_privilege_rel ppr
+ WHERE ppu.`p_id` = ppr.pg_id
+ AND ppr.pg_id = ppg.pg_id
+ AND ppr.p_id = pp.`p_id`
+ <if test="resource != null and resource != ''">
+ AND pp.`resource` = #{resource}
+ </if>
+ AND ppu.`privilege_flag` = '1'
+ AND ppu.`user_id` = #{userId}
+ AND ppu.`status_cd` = '0'
+ AND pp.`status_cd` = '0'
+ AND ppg.status_cd = '0'
+ AND ppr.status_cd = '0'
</select>
-
+ <select id="hasPrivilege" parameterType="Map" resultType="Map">
+ SELECT DISTINCT tt.p_id `pId`,tt.name,tt.pg_id pgId,tt.pg_name pgName,tt.description,tt.create_time createTime FROM (
+ SELECT pp.*,'-1' AS pg_id,'' AS pg_name FROM p_privilege_user ppu,p_privilege pp
+ WHERE ppu.`p_id` = pp.`p_id`
+ AND pp.p_id = #{pId}
+ AND ppu.`privilege_flag` = '0'
+ AND ppu.`user_id` = #{userId}
+ AND ppu.`status_cd` = '0'
+ AND pp.`status_cd` = '0'
+ UNION
+ SELECT pp.*,ppg.pg_id,ppg.name pg_name FROM p_privilege_user ppu,p_privilege_group ppg,p_privilege pp,p_privilege_rel ppr
+ WHERE ppu.`p_id` = ppr.pg_id
+ AND ppr.pg_id = ppg.pg_id
+ AND ppr.p_id = pp.`p_id`
+ AND pp.p_id = #{pId}
+ AND ppu.`privilege_flag` = '1'
+ AND ppu.`user_id` = #{userId}
+ AND ppu.`status_cd` = '0'
+ AND pp.`status_cd` = '0'
+ AND ppg.status_cd = '0'
+ AND ppr.status_cd = '0'
+ ) tt
+ </select>
</mapper>
--
Gitblit v1.8.0