From 230cc19578359baf9ba13e8c215d7178d9b3499d Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 13 五月 2021 13:16:36 +0800
Subject: [PATCH] Merge branch 'test' into 'master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java |    4 ++--
 1 files changed, 2 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 72db3d2..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
@@ -152,10 +152,10 @@
             "<if test='comMngPopulationVO.sex != null and comMngPopulationVO.sex != &quot;&quot;'>" +
             "AND cmp.sex = #{comMngPopulationVO.sex} " +
             " </if> " +
-            "<if test='comMngPopulationVO.ageStart != null'>" +
+            "<if test='comMngPopulationVO.ageStart != null and comMngPopulationVO.ageStart != &quot;&quot;'>" +
             "AND cmp.age <![CDATA[ >= ]]> #{comMngPopulationVO.ageStart} " +
             " </if> " +
-            "<if test='comMngPopulationVO.ageEnd != null'>" +
+            "<if test='comMngPopulationVO.ageEnd != null and comMngPopulationVO.ageStart != &quot;&quot;'>" +
             "AND cmp.age <![CDATA[ <= ]]> #{comMngPopulationVO.ageEnd} " +
             " </if> " +
             "<if test='comMngPopulationVO.nativePlace != null and comMngPopulationVO.nativePlace != &quot;&quot;'>" +

--
Gitblit v1.7.1