From 5bdf058a2a12c113b14e47c9049393642e9dae25 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 28 十一月 2020 19:44:02 +0800
Subject: [PATCH] Merge http://139.155.19.15:8000/supervip/MicroCommunity

---
 service-api/src/main/java/com/java110/api/listener/community/ListCommunitysListener.java |   26 +++++++++++++++++---------
 1 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/service-api/src/main/java/com/java110/api/listener/community/ListCommunitysListener.java b/service-api/src/main/java/com/java110/api/listener/community/ListCommunitysListener.java
index 3788ce1..73507f6 100644
--- a/service-api/src/main/java/com/java110/api/listener/community/ListCommunitysListener.java
+++ b/service-api/src/main/java/com/java110/api/listener/community/ListCommunitysListener.java
@@ -2,15 +2,15 @@
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.api.listener.AbstractServiceApiListener;
-import com.java110.intf.common.IAreaInnerServiceSMO;
-import com.java110.dto.area.AreaDto;
-import com.java110.utils.constant.ServiceCodeConstant;
-import com.java110.utils.util.BeanConvertUtil;
 import com.java110.core.annotation.Java110Listener;
 import com.java110.core.context.DataFlowContext;
-import com.java110.intf.community.ICommunityInnerServiceSMO;
-import com.java110.dto.community.CommunityDto;
 import com.java110.core.event.service.api.ServiceDataFlowEvent;
+import com.java110.dto.area.AreaDto;
+import com.java110.dto.community.CommunityDto;
+import com.java110.intf.common.IAreaInnerServiceSMO;
+import com.java110.intf.community.ICommunityInnerServiceSMO;
+import com.java110.utils.constant.ServiceCodeConstant;
+import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.api.community.ApiCommunityDataVo;
 import com.java110.vo.api.community.ApiCommunityVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -72,9 +72,17 @@
         int count = communityInnerServiceSMOImpl.queryCommunitysCount(communityDto);
 
         List<ApiCommunityDataVo> communitys = null;
-
+        ApiCommunityDataVo apiCommunityDataVo = null;
         if (count > 0) {
-            communitys = BeanConvertUtil.covertBeanList(communityInnerServiceSMOImpl.queryCommunitys(communityDto), ApiCommunityDataVo.class);
+            communitys = new ArrayList<>();
+            List<CommunityDto> communityDtos = communityInnerServiceSMOImpl.queryCommunitys(communityDto);
+
+            for (CommunityDto tmpCommunityDto : communityDtos) {
+                apiCommunityDataVo = BeanConvertUtil.covertBean(tmpCommunityDto, ApiCommunityDataVo.class);
+                apiCommunityDataVo.setCommunityAttrDtos(tmpCommunityDto.getCommunityAttrDtos());
+                communitys.add(apiCommunityDataVo);
+            }
+
 
             refreshCommunityCity(communitys);
         } else {
@@ -104,7 +112,7 @@
         for (ApiCommunityDataVo communityDataVo : communitys) {
             areaCodes.add(communityDataVo.getCityCode());
         }
-        if(areaCodes.size() > 0){
+        if (areaCodes.size() > 0) {
             AreaDto areaDto = new AreaDto();
             areaDto.setAreaCodes(areaCodes.toArray(new String[areaCodes.size()]));
             List<AreaDto> areaDtos = areaInnerServiceSMOImpl.getProvCityArea(areaDto);

--
Gitblit v1.8.0