fix/community: 调整

mcwl-communityCenter/src/main/resources/mapper/communityCenter/CommunityMapper.xml

@@ -15,7 +15,7 @@
     </resultMap>
     <update id="quitCommunity">
         update cc_community_user
-        set del_flag = '1'
+        set del_flag = '2'
         where tenant_id = #{tenantId}
           and community_id = #{communityId}
           and user_id = #{userId}
@@ -24,7 +24,7 @@
 
     <update id="deleteCommunity">
         update cc_community
-        set del_flag = '1'
+        set del_flag = '2'
         where tenant_id = #{tenantId}
           and id = #{communityId}
           and del_flag = '0';
@@ -47,6 +47,8 @@
         select cu.community_id as id, COALESCE(count(*), 0) as join_num
         from cc_community_user cu
         where cu.del_flag = '0'
+          and ((CONVERT_TZ(NOW(), 'SYSTEM', '+08:00') &gt;= start_time
+            AND CONVERT_TZ(NOW(), 'SYSTEM', '+08:00') &lt;= end_time) or (start_time is null and end_time is null))
         group by cu.community_id
     </select>
 
@@ -102,6 +104,8 @@
             and (c.community_name like concat('%', #{joinCommunityListPageRes.searchContent}, '%')
             or c.description like concat('%', #{joinCommunityListPageRes.searchContent}, '%'))
         </if>
+        and ((CONVERT_TZ(NOW(), 'SYSTEM', '+08:00') &gt;= start_time
+        AND CONVERT_TZ(NOW(), 'SYSTEM', '+08:00') &lt;= end_time) or (start_time is null and end_time is null))
     </select>
     <select id="getCommunity" resultType="com.mcwl.communityCenter.domain.Community">
         select *

mcwl-communityCenter/src/main/resources/mapper/communityCenter/CommunityUserMapper.xml

@@ -103,7 +103,6 @@
           and user_id = #{userId}
           and ((CONVERT_TZ(NOW(), 'SYSTEM', '+08:00') >= start_time
             AND CONVERT_TZ(NOW(), 'SYSTEM', '+08:00') <= end_time) or (start_time is null and end_time is null))
-          and (black_end_time is null or NOW() >= black_end_time)
           and del_flag = '0';
     </select>
     <select id="getAllCommunityUser" resultType="com.mcwl.communityCenter.domain.CommunityUser">