From a9e3948c9b9af14a373dacb1cb7babdbe9fd0b07 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 16 七月 2021 14:20:47 +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 | 2 ++
1 files changed, 2 insertions(+), 0 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 1e42251..2cd5f3a 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
@@ -69,10 +69,12 @@
"cmp.remark, " +
"cmv.alley, " +
"cmp.native_place, " +
+ "cmphu.relation, " +
"cmp.nation " +
"FROM " +
"com_mng_population AS cmp " +
"LEFT JOIN com_mng_village AS cmv ON cmv.village_id = cmp.village_id " +
+ "LEFT JOIN com_mng_population_house_user AS cmphu ON cmphu.popul_id = cmp.id " +
"<where>" +
"<if test='comMngPopulationVO.name != null and comMngPopulationVO.name.trim() != ""'>" +
"AND cmp.`name` LIKE concat(#{comMngPopulationVO.name},'%') " +
--
Gitblit v1.7.1