From 576c52d8d8e6fb1e738380cc5fc101a6a2b0b3a8 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 04 九月 2021 16:00:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/user/OrgServiceDaoImplMapper.xml | 80 +++++++++++++++++++++++++++++++++-------
1 files changed, 66 insertions(+), 14 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/user/OrgServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/OrgServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index 3f0de8a..99ccbff
--- a/java110-db/src/main/resources/mapper/user/OrgServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/OrgServiceDaoImplMapper.xml
@@ -7,9 +7,9 @@
<!-- 淇濆瓨缁勭粐淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveBusinessOrgInfo" parameterType="Map">
insert into business_org(
- org_name,operate,parent_org_id,description,org_level,store_id,b_id,org_id
+ org_name,operate,parent_org_id,description,org_level,store_id,b_id,org_id,belong_community_id,allow_operation
) values (
- #{orgName},#{operate},#{parentOrgId},#{description},#{orgLevel},#{storeId},#{bId},#{orgId}
+ #{orgName},#{operate},#{parentOrgId},#{description},#{orgLevel},#{storeId},#{bId},#{orgId},#{belongCommunityId},#{allowOperation}
)
</insert>
@@ -18,7 +18,8 @@
<select id="getBusinessOrgInfo" parameterType="Map" resultType="Map">
select t.org_name,t.org_name orgName,t.operate,t.parent_org_id,t.parent_org_id
parentOrgId,t.description,t.org_level,t.org_level orgLevel,t.store_id,t.store_id storeId,t.b_id,t.b_id
- bId,t.org_id,t.org_id orgId
+ bId,t.org_id,t.org_id orgId,t.belong_community_id ,t.belong_community_id belongCommunityId,
+ t.allow_operation ,t.allow_operation allowOperation
from business_org t
where 1 =1
<if test="orgName !=null and orgName != ''">
@@ -45,6 +46,12 @@
<if test="orgId !=null and orgId != ''">
and t.org_id= #{orgId}
</if>
+ <if test="belongCommunityId !=null and belongCommunityId != ''">
+ and t.belong_community_id= #{belongCommunityId}
+ </if>
+ <if test="allowOperation !=null and allowOperation != ''">
+ and t.allow_operation= #{allowOperation}
+ </if>
</select>
@@ -52,8 +59,9 @@
<!-- 淇濆瓨缁勭粐淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
<insert id="saveOrgInfoInstance" parameterType="Map">
insert into u_org(
- org_name,parent_org_id,description,org_level,status_cd,store_id,b_id,org_id
- ) select t.org_name,t.parent_org_id,t.description,t.org_level,'0',t.store_id,t.b_id,t.org_id from business_org t
+ org_name,parent_org_id,description,org_level,status_cd,store_id,b_id,org_id,belong_community_id,allow_operation
+ ) select t.org_name,t.parent_org_id,t.description,t.org_level,'0',t.store_id,t.b_id,t.org_id,t.belong_community_id,t.allow_operation
+ from business_org t
where 1=1
<if test="orgName !=null and orgName != ''">
and t.org_name= #{orgName}
@@ -77,6 +85,12 @@
<if test="orgId !=null and orgId != ''">
and t.org_id= #{orgId}
</if>
+ <if test="belongCommunityId !=null and belongCommunityId != ''">
+ and t.belong_community_id= #{belongCommunityId}
+ </if>
+ <if test="allowOperation !=null and allowOperation != ''">
+ and t.allow_operation= #{allowOperation}
+ </if>
</insert>
@@ -85,14 +99,24 @@
<select id="getOrgInfo" parameterType="Map" resultType="Map">
select t.org_name,t.org_name orgName,t.parent_org_id,t.parent_org_id
parentOrgId,t.description,t.org_level,t.org_level orgLevel,td.name orgLevelName,t.status_cd,t.status_cd
- statusCd,t.store_id,t.store_id storeId,t.b_id,t.b_id bId,t.org_id,t.org_id orgId,uo.org_name parentOrgName
+ statusCd,t.store_id,t.store_id storeId,t.b_id,t.b_id bId,t.org_id,t.org_id orgId,uo.org_name parentOrgName,
+ t.belong_community_id ,t.belong_community_id belongCommunityId,
+ t.allow_operation ,t.allow_operation allowOperation
from u_org t,t_dict td,u_org uo
+ <if test="staffId != null and staffId !=''">
+ ,u_org_staff_rel uosr
+ </if>
where 1 =1
and t.org_level = td.status_cd
and td.table_name='u_org'
and td.table_columns = 'org_level'
and t.parent_org_id = uo.org_id
and uo.status_cd = '0'
+ <if test="staffId != null and staffId !=''">
+ and uosr.org_id = t.org_id
+ and uosr.staff_id = #{staffId}
+ and uosr.status_cd = '0'
+ </if>
<if test="orgName !=null and orgName != ''">
and t.org_name= #{orgName}
</if>
@@ -116,6 +140,12 @@
</if>
<if test="orgId !=null and orgId != ''">
and t.org_id= #{orgId}
+ </if>
+ <if test="belongCommunityId !=null and belongCommunityId != ''">
+ and t.belong_community_id= #{belongCommunityId}
+ </if>
+ <if test="allowOperation !=null and allowOperation != ''">
+ and t.allow_operation= #{allowOperation}
</if>
<if test="page != -1 and page != null ">
limit #{page}, #{row}
@@ -142,8 +172,14 @@
<if test="orgLevel !=null and orgLevel != ''">
, t.org_level= #{orgLevel}
</if>
+ <if test="belongCommunityId !=null and belongCommunityId != ''">
+ , t.belong_community_id= #{belongCommunityId}
+ </if>
<if test="storeId !=null and storeId != ''">
, t.store_id= #{storeId}
+ </if>
+ <if test="allowOperation !=null and allowOperation != ''">
+ , t.allow_operation= #{allowOperation}
</if>
where 1=1
<if test="bId !=null and bId != ''">
@@ -158,13 +194,21 @@
<!-- 鏌ヨ缁勭粐鏁伴噺 add by wuxw 2018-07-03 -->
<select id="queryOrgsCount" parameterType="Map" resultType="Map">
select count(1) count
- from u_org t,t_dict td,u_org uo
+ from u_org t,t_dict td,u_org uo
+ <if test="staffId != null and staffId !=''">
+ ,u_org_staff_rel uosr
+ </if>
where 1 =1
- and t.org_level = td.status_cd
- and td.table_name='u_org'
- and td.table_columns = 'org_level'
- and t.parent_org_id = uo.org_id
- and uo.status_cd = '0'
+ and t.org_level = td.status_cd
+ and td.table_name='u_org'
+ and td.table_columns = 'org_level'
+ and t.parent_org_id = uo.org_id
+ and uo.status_cd = '0'
+ <if test="staffId != null and staffId !=''">
+ and uosr.org_id = t.org_id
+ and uosr.staff_id = #{staffId}
+ and uosr.status_cd = '0'
+ </if>
<if test="orgName !=null and orgName != ''">
and t.org_name= #{orgName}
</if>
@@ -189,7 +233,15 @@
<if test="orgId !=null and orgId != ''">
and t.org_id= #{orgId}
</if>
-
+ <if test="belongCommunityId !=null and belongCommunityId != ''">
+ and t.belong_community_id= #{belongCommunityId}
+ </if>
+ <if test="allowOperation !=null and allowOperation != ''">
+ and t.allow_operation= #{allowOperation}
+ </if>
+ <if test="orgId !=null and orgId != ''">
+ and t.org_id= #{orgId}
+ </if>
</select>
<!-- 鏌ヨ涓婄骇缁勭粐淇℃伅 -->
@@ -207,4 +259,4 @@
]]>
</select>
-</mapper>
+</mapper>
\ No newline at end of file
--
Gitblit v1.8.0