From d79ff0d59709b9bb6f9fb3b44107dc46a65a7b72 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 19 八月 2021 19:35:06 +0800
Subject: [PATCH] 优化代码

---
 java110-db/src/main/resources/mapper/user/OrgServiceDaoImplMapper.xml |  382 ++++++++++++++++++++++++++++++++---------------------
 1 files changed, 229 insertions(+), 153 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 389d625..99ccbff
--- a/java110-db/src/main/resources/mapper/user/OrgServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/OrgServiceDaoImplMapper.xml
@@ -5,182 +5,258 @@
 <mapper namespace="orgServiceDaoImpl">
 
     <!-- 淇濆瓨缁勭粐淇℃伅 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
-) values (
-#{orgName},#{operate},#{parentOrgId},#{description},#{orgLevel},#{storeId},#{bId},#{orgId}
-)
-       </insert>
+    <insert id="saveBusinessOrgInfo" parameterType="Map">
+        insert into business_org(
+        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},#{belongCommunityId},#{allowOperation}
+        )
+    </insert>
 
 
-       <!-- 鏌ヨ缁勭粐淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
-       <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 
-from business_org t 
-where 1 =1 
-<if test="orgName !=null and orgName != ''">
-   and t.org_name= #{orgName}
-</if> 
-<if test="operate !=null and operate != ''">
-   and t.operate= #{operate}
-</if> 
-<if test="parentOrgId !=null and parentOrgId != ''">
-   and t.parent_org_id= #{parentOrgId}
-</if> 
-<if test="description !=null and description != ''">
-   and t.description= #{description}
-</if> 
-<if test="orgLevel !=null and orgLevel != ''">
-   and t.org_level= #{orgLevel}
-</if> 
-<if test="storeId !=null and storeId != ''">
-   and t.store_id= #{storeId}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="orgId !=null and orgId != ''">
-   and t.org_id= #{orgId}
-</if> 
+    <!-- 鏌ヨ缁勭粐淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
+    <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,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 != ''">
+            and t.org_name= #{orgName}
+        </if>
+        <if test="operate !=null and operate != ''">
+            and t.operate= #{operate}
+        </if>
+        <if test="parentOrgId !=null and parentOrgId != ''">
+            and t.parent_org_id= #{parentOrgId}
+        </if>
+        <if test="description !=null and description != ''">
+            and t.description= #{description}
+        </if>
+        <if test="orgLevel !=null and orgLevel != ''">
+            and t.org_level= #{orgLevel}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </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>
 
-       </select>
-
-
-
+    </select>
 
 
     <!-- 淇濆瓨缁勭粐淇℃伅鑷� 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 where 1=1
-<if test="orgName !=null and orgName != ''">
-   and t.org_name= #{orgName}
-</if> 
-   and t.operate= 'ADD'
-<if test="parentOrgId !=null and parentOrgId != ''">
-   and t.parent_org_id= #{parentOrgId}
-</if> 
-<if test="description !=null and description != ''">
-   and t.description= #{description}
-</if> 
-<if test="orgLevel !=null and orgLevel != ''">
-   and t.org_level= #{orgLevel}
-</if> 
-<if test="storeId !=null and storeId != ''">
-   and t.store_id= #{storeId}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="orgId !=null and orgId != ''">
-   and t.org_id= #{orgId}
-</if> 
+        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}
+        </if>
+        and t.operate= 'ADD'
+        <if test="parentOrgId !=null and parentOrgId != ''">
+            and t.parent_org_id= #{parentOrgId}
+        </if>
+        <if test="description !=null and description != ''">
+            and t.description= #{description}
+        </if>
+        <if test="orgLevel !=null and orgLevel != ''">
+            and t.org_level= #{orgLevel}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </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>
 
     </insert>
 
 
-
     <!-- 鏌ヨ缁勭粐淇℃伅 add by wuxw 2018-07-03 -->
     <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,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 
-from u_org t 
-where 1 =1 
-<if test="orgName !=null and orgName != ''">
-   and t.org_name= #{orgName}
-</if> 
-<if test="parentOrgId !=null and parentOrgId != ''">
-   and t.parent_org_id= #{parentOrgId}
-</if> 
-<if test="description !=null and description != ''">
-   and t.description= #{description}
-</if> 
-<if test="orgLevel !=null and orgLevel != ''">
-   and t.org_level= #{orgLevel}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="storeId !=null and storeId != ''">
-   and t.store_id= #{storeId}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="orgId !=null and orgId != ''">
-   and t.org_id= #{orgId}
-</if> 
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        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,
+        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>
+        <if test="parentOrgId !=null and parentOrgId != ''">
+            and t.parent_org_id= #{parentOrgId}
+        </if>
+        <if test="description !=null and description != ''">
+            and t.description= #{description}
+        </if>
+        <if test="orgLevel !=null and orgLevel != ''">
+            and t.org_level= #{orgLevel}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </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}
+        </if>
 
     </select>
 
 
-
-
     <!-- 淇敼缁勭粐淇℃伅 add by wuxw 2018-07-03 -->
     <update id="updateOrgInfoInstance" parameterType="Map">
-        update  u_org t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="orgName !=null and orgName != ''">
-, t.org_name= #{orgName}
-</if> 
-<if test="parentOrgId !=null and parentOrgId != ''">
-, t.parent_org_id= #{parentOrgId}
-</if> 
-<if test="description !=null and description != ''">
-, t.description= #{description}
-</if> 
-<if test="orgLevel !=null and orgLevel != ''">
-, t.org_level= #{orgLevel}
-</if> 
-<if test="storeId !=null and storeId != ''">
-, t.store_id= #{storeId}
-</if> 
- where 1=1 <if test="bId !=null and bId != ''">
-and t.b_id= #{bId}
-</if> 
-<if test="orgId !=null and orgId != ''">
-and t.org_id= #{orgId}
-</if> 
+        update u_org t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="orgName !=null and orgName != ''">
+            , t.org_name= #{orgName}
+        </if>
+        <if test="parentOrgId !=null and parentOrgId != ''">
+            , t.parent_org_id= #{parentOrgId}
+        </if>
+        <if test="description !=null and description != ''">
+            , t.description= #{description}
+        </if>
+        <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 != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="orgId !=null and orgId != ''">
+            and t.org_id= #{orgId}
+        </if>
 
     </update>
 
     <!-- 鏌ヨ缁勭粐鏁伴噺 add by wuxw 2018-07-03 -->
-     <select id="queryOrgsCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from u_org t 
-where 1 =1 
-<if test="orgName !=null and orgName != ''">
-   and t.org_name= #{orgName}
-</if> 
-<if test="parentOrgId !=null and parentOrgId != ''">
-   and t.parent_org_id= #{parentOrgId}
-</if> 
-<if test="description !=null and description != ''">
-   and t.description= #{description}
-</if> 
-<if test="orgLevel !=null and orgLevel != ''">
-   and t.org_level= #{orgLevel}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="storeId !=null and storeId != ''">
-   and t.store_id= #{storeId}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="orgId !=null and orgId != ''">
-   and t.org_id= #{orgId}
-</if> 
+    <select id="queryOrgsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        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>
+        <if test="parentOrgId !=null and parentOrgId != ''">
+            and t.parent_org_id= #{parentOrgId}
+        </if>
+        <if test="description !=null and description != ''">
+            and t.description= #{description}
+        </if>
+        <if test="orgLevel !=null and orgLevel != ''">
+            and t.org_level= #{orgLevel}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </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="orgId !=null and orgId != ''">
+            and t.org_id= #{orgId}
+        </if>
 
+    </select>
+    <!-- 鏌ヨ涓婄骇缁勭粐淇℃伅 -->
+    <select id="getParentOrgInfo" parameterType="Map" resultType="Map">
+        <![CDATA[
+            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,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
+            FROM u_org o,u_org t
+            WHERE o.`org_level` = #{orgLevel}
+                AND o.`store_id` = t.`store_id`
+                AND o.`parent_org_id` = t.`org_id`
+                AND o.`org_id` <> o.`parent_org_id`
+                AND o.`store_id` = #{storeId}
+        ]]>
+    </select>
 
-     </select>
-
-</mapper>
+</mapper>
\ No newline at end of file

--
Gitblit v1.8.0