From f0d625c9af19c556c5d2e70967dbd3b3093608dc Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期二, 22 六月 2021 17:04:01 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java | 3 +++
1 files changed, 3 insertions(+), 0 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 f20a336..ec024fd 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
@@ -83,6 +83,9 @@
"<if test='neighborCircleAdminDTO.startAt != null and neighborCircleAdminDTO.endAt !=null '>" +
"and nc.create_at between #{neighborCircleAdminDTO.startAt} and #{neighborCircleAdminDTO.endAt} \n" +
" </if> " +
+ "<if test='neighborCircleAdminDTO.status != null '>" +
+ "and nc.status = #{neighborCircleAdminDTO.status} " +
+ " </if> " +
"</where>"+
"order by " +
"case when nc.`status`=1 then 0 else 1 end, \n" +
--
Gitblit v1.7.1