From 6424521a768125e66b64a23d2094e05eb95b105f Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 08 十月 2021 11:30:14 +0800
Subject: [PATCH] bug修复
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationHouseDAO.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/ComMngPopulationHouseDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationHouseDAO.java
index 2896bac..6e15db0 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
@@ -28,7 +28,7 @@
@Mapper
public interface ComMngPopulationHouseDAO extends BaseMapper<ComMngPopulationHouseDO> {
- @Select("select cmphu.house_id,cmph.address,cmph.status,cmphu.popul_id,cmphu.residence,cmphu.relation_id,cmphu.relation from com_mng_population_house_user cmphu "
+ @Select("select cmphu.id, cmphu.house_id,cmph.address,cmph.status,cmph.purpose,cmph.control_status,cmphu.popul_id,cmphu.residence,cmphu.relation_id,cmphu.relation from com_mng_population_house_user cmphu "
+ " left join com_mng_population_house as cmph on cmph.id = cmphu.house_id "
+ " where cmphu.popul_id = #{populId}")
List<ComMngHouseVo> getPopulHouseListByPopulId(@Param("populId") Long populId);
@@ -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} " + "</if> group by id "
+ " </script>")
List<PopulationListVO> getGridVillageBuildingPopulationList(@Param("houseId") Long houseId,
@Param("relation") Integer relation, @Param("relationId") Integer relationId);
--
Gitblit v1.7.1