From 6f9cff11cc23f8e6e71c5b8a15150e3f634ed985 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期日, 26 九月 2021 13:38:48 +0800
Subject: [PATCH] Merge branch 'test_bak' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationHouseDAO.java | 2 +-
1 files changed, 1 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 2896bac..52a57b1 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
@@ -164,7 +164,7 @@
+ " LEFT JOIN com_mng_population AS cmp ON cmp.id = cmphu.popul_id "
+ " left join com_mng_population_community_tags AS cmpct on cmp.id = cmpct.population_id " + "WHERE "
+ " cmphu.house_id = #{houseId} " + "<if test='relation != null '>" + " AND cmphu.relation = #{relation} "
- + " </if> " + "<if test='relationId != null '>" + " AND cmphu.relation_id = #{relationId} " + " </if> "
+ + " </if> " + "<if test='relationId != null '>" + " AND cmphu.relation_id = #{relationId} " + " group by id </if> "
+ " </script>")
List<PopulationListVO> getGridVillageBuildingPopulationList(@Param("houseId") Long houseId,
@Param("relation") Integer relation, @Param("relationId") Integer relationId);
--
Gitblit v1.7.1