From c4c904031919bd0456cd14fca583d9fa9eea40d8 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 18 十月 2021 16:19:38 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActVillageDAO.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActVillageDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActVillageDAO.java
index 4d503bf..0e785fa 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActVillageDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActVillageDAO.java
@@ -34,9 +34,9 @@
         + " from com_mng_population_house where village_id = #{villageId}")
     ComMngVillageVO getStatisticsCount(@Param("villageId") Long villageId);
 
-    @Select("select count(village_id) as villageTotal"
-        + ",(select count(village_id) from com_mng_village where community_id = #{communityId} and type = 1) as townTotal"
-        + ",(select count(village_id) from com_mng_village where community_id = #{communityId} and type = 2) as countrysideTotal"
+    @Select("select count(distinct `name`) as villageTotal"
+        + ",(select count(distinct `name`) from com_mng_village where community_id = #{communityId} and type = 1) as townTotal"
+        + ",(select count(distinct `name`) from com_mng_village where community_id = #{communityId} and type = 2) as countrysideTotal"
         + " from com_mng_village where community_id = #{communityId}")
     ComMngVillageTotalVO getVillageStatisticsCount(@Param("communityId") Long communityId);
 

--
Gitblit v1.7.1