From 02f18587bd8860b305e2c688e20465be166bb48c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 七月 2021 15:14:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationHouseDAO.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationHouseDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationHouseDAO.java
index 224a0bd..7ab5591 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationHouseDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationHouseDAO.java
@@ -142,7 +142,7 @@
" AND cmv.alley = #{populationHouseAdminDTO.road} " +
" </if> " +
"<if test='populationHouseAdminDTO.doorNo != null and populationHouseAdminDTO.doorNo != "" '>" +
- " AND cmv.houseNum = #{populationHouseAdminDTO.doorNo} " +
+ " AND cmv.house_num = #{populationHouseAdminDTO.doorNo} " +
" </if> " +
"<if test='populationHouseAdminDTO.floor != null and populationHouseAdminDTO.floor != "" '>" +
" AND cmph.floor = #{populationHouseAdminDTO.floor} " +
@@ -156,6 +156,9 @@
"<if test='populationHouseAdminDTO.villageId != null'>" +
" and cmph.village_id = #{populationHouseAdminDTO.villageId} " +
" </if> " +
+ "<if test='populationHouseAdminDTO.address != null and populationHouseAdminDTO.address != "" '>" +
+ " AND cmph.address = #{populationHouseAdminDTO.address} " +
+ " </if> " +
" </where>" +
" order by update_at desc" +
" </script>")
--
Gitblit v1.7.1