From a225b159a5ea61c6fb0a46f5ff9d2e6862cd7706 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 13 五月 2021 13:16:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
index 63d9f86..65c355f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
@@ -126,6 +126,9 @@
"cmp.relation, \n" +
"cmp.marriage, \n" +
"cmp.culture_level, \n" +
+ "cmp.out_or_local, \n" +
+ "cmp.census_register, \n" +
+ "cmp.healthy, \n" +
"cmp.is_rent \n" +
"FROM \n" +
"com_mng_population AS cmp " +
@@ -149,10 +152,10 @@
"<if test='comMngPopulationVO.sex != null and comMngPopulationVO.sex != ""'>" +
"AND cmp.sex = #{comMngPopulationVO.sex} " +
" </if> " +
- "<if test='comMngPopulationVO.ageStart != null'>" +
+ "<if test='comMngPopulationVO.ageStart != null and comMngPopulationVO.ageStart != ""'>" +
"AND cmp.age <![CDATA[ >= ]]> #{comMngPopulationVO.ageStart} " +
" </if> " +
- "<if test='comMngPopulationVO.ageEnd != null'>" +
+ "<if test='comMngPopulationVO.ageEnd != null and comMngPopulationVO.ageStart != ""'>" +
"AND cmp.age <![CDATA[ <= ]]> #{comMngPopulationVO.ageEnd} " +
" </if> " +
"<if test='comMngPopulationVO.nativePlace != null and comMngPopulationVO.nativePlace != ""'>" +
--
Gitblit v1.7.1