1111

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseController.java

 package com.gic.haoban.manage.web.controller;
 
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import cn.hutool.core.collection.CollectionUtil;
+
 import com.gic.enterprise.api.dto.EnterpriseAndUserDTO;
+import com.gic.enterprise.api.dto.EnterpriseDTO;
 import com.gic.enterprise.api.service.EnterpriseService;
 import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.manage.api.dto.EnterpriseDetailDTO;
+import com.gic.haoban.manage.api.dto.YwWxEnterpriseDTO;
+import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
 import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
 import com.gic.haoban.manage.web.anno.IgnoreLogin;
 import com.gic.haoban.manage.web.auth.AuthRequestUtil;
@@ -22,6 +30,9 @@ public class WxEnterpriseController extends WebBaseController{
 	private WxEnterpriseRelatedApiService wxEnterpriseRelatedApiService;
 	@Autowired
 	private EnterpriseService enterpriseService;
+	@Autowired
+	private WxEnterpriseApiService wxEnterpriseApiService;
+	
 	//授权企业列表
 	@IgnoreLogin
 	@RequestMapping("wx-enterprise-list")
@@ -30,6 +41,18 @@ public class WxEnterpriseController extends WebBaseController{
 //		LoginVO login = (LoginVO) AuthRequestUtil.getSessionUser();
 //		String wxEnterpriseId = login.getWxEnterpriseId();
 		List<EnterpriseDetailDTO> list = wxEnterpriseRelatedApiService.listEnterpriseByWxEnterpriseId(wxEnterpriseId);
+		if(CollectionUtil.isNotEmpty(list)){
+			List<String> enterpriseIds = list.stream().map(s->s.getEnterpriseId()).collect(Collectors.toList());
+			List<EnterpriseDTO> enterpriseList = enterpriseService.listEnterpriseByIds(enterpriseIds);
+			Map<String,EnterpriseDTO> map = com.gic.commons.util.CollectionUtil.toMap(enterpriseList, "enterpriseId");
+			for(EnterpriseDetailDTO dto:list){
+				EnterpriseDTO enterpriseDTO = map.get(dto.getEnterpriseId());
+				if(enterpriseDTO!=null){
+					dto.setEnterpriseName(enterpriseDTO.getEnterpriseName());
+					dto.setEnterpriseLogo(enterpriseDTO.getImageUrl());
+				}
+			}
+		}
 		return resultResponse(HaoBanErrCode.ERR_1, list);
  
 	}

haoban-manage3-web/src/main/webapp/WEB-INF/dubbo-haoban-manage-web.xml

@@ -22,6 +22,8 @@
 	<dubbo:reference interface="com.gic.haoban.manage.api.service.StaffApiService" id="staffApiService"/>
     <dubbo:reference interface="com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService" id="wxEnterpriseRelatedApiService" />
 	<dubbo:reference interface="com.gic.haoban.manage.api.service.ApplicationApiService" id="applicationApiService"/>
+	<dubbo:reference interface="com.gic.haoban.manage.api.service.WxEnterpriseApiService" id="wxEnterpriseApiService"/>
+	
 	
 	<dubbo:reference interface="com.gic.enterprise.api.service.EnterpriseService" id="enterpriseService"/>