From 6cbbbc92f623c83e918ef0f2eea8ff82cc920b1b Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期五, 30 四月 2021 10:57:04 +0800
Subject: [PATCH] Add:添加邻里圈删除

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java
index e642499..66b747d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java
@@ -66,10 +66,12 @@
     @Select("<script> \n"+
             "SELECT\n" +
             "nc.*,\n" +
-            "u.`name` AS releaseName \n" +
+            "u.`name` AS releaseName,u.`type` as userType\n" +
+            ",ca.name as communityName\n" +
             "FROM\n" +
             "com_act_neighbor_circle nc\n" +
             "LEFT JOIN sys_user u ON nc.release_id = u.user_id\n" +
+            "left join com_act ca on u.community_id=ca.community_id \n" +
             "<where>"+
             "nc.community_id = #{neighborCircleAdminDTO.communityId}  \n"+
             "<if test='neighborCircleAdminDTO.releaseContent != null and neighborCircleAdminDTO.releaseContent != &quot;&quot;'>" +
@@ -79,7 +81,9 @@
             "and nc.create_at between #{neighborCircleAdminDTO.startAt} and #{neighborCircleAdminDTO.endAt}  \n" +
             " </if> " +
             "</where>"+
-            "order by nc.`status` asc,nc.create_at desc " +
+            "order by " +
+            "case when nc.`status`=1 then 0 else 1 end, \n" +
+            "nc.`status` asc,nc.create_at desc " +
             "</script>")
     IPage<ComActNeighborCircleAdminVO> pageNeighborByAdmin(Page page,@Param("neighborCircleAdminDTO") ComActNeighborCircleAdminDTO neighborCircleAdminDTO);
 

--
Gitblit v1.7.1