From b714023894362053bca15f5295e307049ee9216e Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 15 四月 2021 18:27:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 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 152ce9d..862b501 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
@@ -125,19 +125,19 @@
             "com_mng_population AS cmp " +
             "LEFT JOIN com_mng_village AS cmv ON cmv.village_id = cmp.village_id " +
             "<where>" +
-            "<if test='comMngPopulationVO.name != null and comMngPopulationVO.name.trim() != &quot;&quot;'>" +
+            "<if test='comMngPopulationVO.name != null and comMngPopulationVO.name != &quot;&quot;'>" +
             "AND cmp.`name` LIKE concat(#{comMngPopulationVO.name},'%') " +
             " </if> " +
-            "<if test='comMngPopulationVO.road != null and comMngPopulationVO.road.trim() != &quot;&quot;'>" +
+            "<if test='comMngPopulationVO.road != null and comMngPopulationVO.road != &quot;&quot;'>" +
             "AND cmp.road LIKE concat(#{comMngPopulationVO.road},'%') " +
             " </if> " +
-            "<if test='comMngPopulationVO.doorNo != null and comMngPopulationVO.doorNo.trim() != &quot;&quot;'>" +
+            "<if test='comMngPopulationVO.doorNo != null and comMngPopulationVO.doorNo != &quot;&quot;'>" +
             "AND cmp.door_no = #{comMngPopulationVO.doorNo} " +
             " </if> " +
-            "<if test='comMngPopulationVO.alley != null and comMngPopulationVO.alley.trim() != &quot;&quot;'>" +
+            "<if test='comMngPopulationVO.alley != null and comMngPopulationVO.alley != &quot;&quot;'>" +
             "AND cmv.alley LIKE concat(#{comMngPopulationVO.alley},'%') " +
             " </if> " +
-            "<if test='comMngPopulationVO.sex != null and comMngPopulationVO.sex.trim() != &quot;&quot;'>" +
+            "<if test='comMngPopulationVO.sex != null and comMngPopulationVO.sex != &quot;&quot;'>" +
             "AND cmp.sex = #{comMngPopulationVO.sex} " +
             " </if> " +
             "<if test='comMngPopulationVO.ageStart != null'>" +
@@ -146,19 +146,19 @@
             "<if test='comMngPopulationVO.ageEnd != null'>" +
             "AND cmp.age <![CDATA[ <= ]]> #{comMngPopulationVO.ageEnd} " +
             " </if> " +
-            "<if test='comMngPopulationVO.nativePlace != null and comMngPopulationVO.nativePlace.trim() != &quot;&quot;'>" +
+            "<if test='comMngPopulationVO.nativePlace != null and comMngPopulationVO.nativePlace != &quot;&quot;'>" +
             "AND cmp.native_place LIKE concat(#{comMngPopulationVO.nativePlace},'%') " +
             " </if> " +
-            "<if test='comMngPopulationVO.nation != null and comMngPopulationVO.nation.trim() != &quot;&quot;'>" +
+            "<if test='comMngPopulationVO.nation != null and comMngPopulationVO.nation != &quot;&quot;'>" +
             "AND cmp.nation = #{comMngPopulationVO.nation} " +
             " </if> " +
-            "<if test='comMngPopulationVO.politicalOutlook != null and comMngPopulationVO.politicalOutlook.trim() != &quot;&quot;'>" +
+            "<if test='comMngPopulationVO.politicalOutlook != null and comMngPopulationVO.politicalOutlook != &quot;&quot;'>" +
             "AND cmp.political_outlook = #{comMngPopulationVO.politicalOutlook} " +
             " </if> " +
-            "<if test='comMngPopulationVO.cardNo != null and comMngPopulationVO.cardNo.trim() != &quot;&quot;'>" +
+            "<if test='comMngPopulationVO.cardNo != null and comMngPopulationVO.cardNo != &quot;&quot;'>" +
             "AND cmp.card_no = #{comMngPopulationVO.cardNo} " +
             " </if> " +
-            "<if test='comMngPopulationVO.remark != null and comMngPopulationVO.remark.trim() != &quot;&quot;'>" +
+            "<if test='comMngPopulationVO.remark != null and comMngPopulationVO.remark != &quot;&quot;'>" +
             "AND cmp.remark = #{comMngPopulationVO.remark} " +
             " </if> " +
             " </where>" +

--
Gitblit v1.7.1