From 6ac0849d13ec2f178b2daa6cd3e63bbe9fdde596 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 20 四月 2021 21:22:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComOpsHouseDAO.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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..71410ee 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
@@ -23,7 +23,7 @@
@Select("select type,name,phone,image_url from sys_user where user_id=#{userId}")
LoginUserInfoVO selectUserByUserId(Long userId);
- @Select("select user_id from sys_user where user_id=#{name} limit 1")
+ @Select("select user_id from sys_user where name like concat('%',#{name},'%') limit 1")
Long selectUserIdByName(String name);
@Select("<script> " +
@@ -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