From c3ce38cb41d4e4a7d036576b7be52ec2d8c3e724 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期一, 12 四月 2021 16:07:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComOpsHouseDAO.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComOpsHouseDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComOpsHouseDAO.java
index f222195..2aa60b3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComOpsHouseDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComOpsHouseDAO.java
@@ -58,16 +58,18 @@
" </if> " +
-
"<if test='pageComOpsHouseDTO.houseCommunityId != null '>" +
"AND d.house_community_id=#{pageComOpsHouseDTO.houseCommunityId} \n" +
" </if> " +
- "<if test='pageComOpsHouseDTO.status != null and pageComOpsHouseDTO.status !=4 '>" +
+ "<if test='pageComOpsHouseDTO.status != null and pageComOpsHouseDTO.status < 4 '>" +
"AND d.status=#{pageComOpsHouseDTO.status} \n" +
" </if> " +
"<if test='pageComOpsHouseDTO.status != null and pageComOpsHouseDTO.status ==4 '>" +
"AND d.status in (0,2) \n" +
" </if> " +
+ "<if test='pageComOpsHouseDTO.status != null and pageComOpsHouseDTO.status ==5 '>" +
+ "AND d.status in (1,3) \n" +
+ " </if> " +
"<if test='pageComOpsHouseDTO.houseCommunityName != null and pageComOpsHouseDTO.houseCommunityName.trim() != ""'>" +
" and d.`house_community_name` LIKE concat( #{pageComOpsHouseDTO.houseCommunityName}, '%' ) \n" +
" </if> " +
--
Gitblit v1.7.1