From 0ab3aac94882cc05a0051a2c7355c0d67954376b Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期六, 07 五月 2022 17:48:31 +0800
Subject: [PATCH] 花城优化

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDynTypeDOMapper.xml |   28 ++++++++++++----------------
 1 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDynTypeDOMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDynTypeDOMapper.xml
index 4ac0903..d3e6201 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDynTypeDOMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDynTypeDOMapper.xml
@@ -38,9 +38,6 @@
             LEFT JOIN sys_user AS su1 ON su1.user_id = cadt.update_by
             where cadt.community_id = 0 and cadt.is_del = 2
             <if test="comActDynTypeDTO.category != null">
-                <if test="comActDynTypeDTO.category == 3 or comActDynTypeDTO.category == 2">
-                    AND 1=2
-                </if>
                 AND cadt.category = #{comActDynTypeDTO.category}
             </if>
             <if test="comActDynTypeDTO.keyWord != null and comActDynTypeDTO.keyWord != &quot;&quot;">
@@ -63,12 +60,13 @@
         LEFT JOIN sys_user AS su1 ON su1.user_id = cadt.update_by
         where cadt.is_del = 2
         <if test='comActDynTypeDTO.category != null '>
-            <if test="comActDynTypeDTO.category != 3">
-                <if test="comActDynTypeDTO.communityId != null">
-                    and cadt.community_id = ${comActDynTypeDTO.communityId}
-                </if>
-            </if>
             AND cadt.category = #{comActDynTypeDTO.category}
+        </if>
+        <if test="comActDynTypeDTO.communityId != null">
+            <if test="comActDynTypeDTO.communityId == 0">
+                AND 1=2
+            </if>
+            and cadt.community_id = ${comActDynTypeDTO.communityId}
         </if>
         <if test="comActDynTypeDTO.keyWord != null and comActDynTypeDTO.keyWord != &quot;&quot;">
             and (cadt.id = #{comActDynTypeDTO.keyWord} or cadt.`name` like concat (#{comActDynTypeDTO.keyWord},'%'))
@@ -93,9 +91,6 @@
         LEFT JOIN sys_user AS su1 ON su1.user_id = cadt.update_by
         where cadt.community_id = 0 and cadt.is_del = 2
         <if test="comActDynTypeDTO.category != null">
-            <if test="comActDynTypeDTO.category == 3 or comActDynTypeDTO.category == 2">
-                AND 1=2
-            </if>
             AND cadt.category = #{comActDynTypeDTO.category}
         </if>
         <if test="comActDynTypeDTO.keyWord != null and comActDynTypeDTO.keyWord != &quot;&quot;">
@@ -118,13 +113,14 @@
         LEFT JOIN sys_user AS su1 ON su1.user_id = cadt.update_by
         where cadt.is_del = 2
         <if test='comActDynTypeDTO.category != null '>
-            <if test="comActDynTypeDTO.category != 3">
-                <if test="comActDynTypeDTO.communityId != null">
-                    and cadt.community_id = ${comActDynTypeDTO.communityId}
-                </if>
-            </if>
             AND cadt.category = #{comActDynTypeDTO.category}
         </if>
+        <if test="comActDynTypeDTO.communityId != null">
+            <if test="comActDynTypeDTO.communityId == 0">
+                AND 1=2
+            </if>
+            and cadt.community_id = ${comActDynTypeDTO.communityId}
+        </if>
         <if test="comActDynTypeDTO.keyWord != null and comActDynTypeDTO.keyWord != &quot;&quot;">
             and (cadt.id = #{comActDynTypeDTO.keyWord} or cadt.`name` like concat (#{comActDynTypeDTO.keyWord},'%'))
         </if>

--
Gitblit v1.7.1