From 12cbe6b75a2cd522dbff3e68df7b2f6f6b86bedf Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 29 四月 2021 16:59:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 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 5d1c0da..e642499 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
@@ -43,7 +43,7 @@
" FROM " +
" com_act_neighbor_circle AS canc" +
" left join sys_user as su on su.user_id = canc.release_id" +
- " where canc.status = 2 and canc.community_id = #{communityId} " +
+ " where canc.status = 2 and canc.community_id = #{neighborCircleAppDTO.communityId} " +
"<if test='neighborCircleAppDTO.type != null and neighborCircleAppDTO.type == 1'>" +
" order by (canc.last_views_num + canc.last_comment_num + canc.last_fabulous_num) desc " +
" </if> " +
@@ -71,11 +71,12 @@
"com_act_neighbor_circle nc\n" +
"LEFT JOIN sys_user u ON nc.release_id = u.user_id\n" +
"<where>"+
- "<if test='neighborCircleAdminDTO.releaseContent != null and neighborCircleAdminDTO.releaseContent.trim() != ""'>" +
- "and t.release_content LIKE concat('%',#{neighborCircleAdminDTO.releaseContent}, '%' ) " +
+ "nc.community_id = #{neighborCircleAdminDTO.communityId} \n"+
+ "<if test='neighborCircleAdminDTO.releaseContent != null and neighborCircleAdminDTO.releaseContent != ""'>" +
+ "and nc.release_content like concat('%',#{neighborCircleAdminDTO.releaseContent},'%') \n" +
" </if> " +
"<if test='neighborCircleAdminDTO.startAt != null and neighborCircleAdminDTO.endAt !=null '>" +
- "and t.create_at between #{neighborCircleAdminDTO.startAt} and #{neighborCircleAdminDTO.endAt} " +
+ "and nc.create_at between #{neighborCircleAdminDTO.startAt} and #{neighborCircleAdminDTO.endAt} \n" +
" </if> " +
"</where>"+
"order by nc.`status` asc,nc.create_at desc " +
@@ -85,4 +86,11 @@
@Select("select * from sys_user where user_id=#{userId}")
AdministratorsUserVO selectUserByUserId(@Param("userId") Long userId);
+ @Select("<script> " +
+ "select id,release_content,release_images,status,create_at,comment_num,fabulous_num,forward_num,views_num,refuse_reason " +
+ " from com_act_neighbor_circle as canc " +
+ " where canc.release_id = #{userId} order by create_at desc" +
+ " </script>")
+ IPage<ComActNeighborCircleAppVO> neighborExamineByApp(Page page,@Param("userId") Long userId);
+
}
--
Gitblit v1.7.1