111

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

 package com.gic.haoban.manage.web.controller;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -51,15 +52,19 @@ public class EnterpriseController extends WebBaseController{
 	@Autowired
 	private EnterpriseService enterpriseService;
 //	@Autowired
-//	private WxEnterpriseRelatedApiService wxEnterpriseRelatedApiService;
+//	private WxEnterpriseRelatedApiService wxEnterpriseRelllatedApiService;
 	//企业列表
 	@RequestMapping("wx-enterprise-list")
 	public HaobanResponse wxEnterpriseList(BasePageInfo pageInfo,String keyword,String gicEnterpriseName,Integer gicContactHelper,String version) {
 		List<EnterpriseDTO> enterpriseNames = enterpriseService.getEnterpriseByName(gicEnterpriseName);
+		List<String> wxEnterpriseIds = new ArrayList<String>();
+		if(CollectionUtil.isNotEmpty(enterpriseNames)){
 			List<String>enterpriseIds = enterpriseNames.stream().map(s->s.getEnterpriseId()).collect(Collectors.toList());
 			List<EnterpriseDetailDTO> wxEnterpriseIdDTOs = wxEnterpriseRelatedApiService.listEnterpriseByEnterpriseIds(enterpriseIds);
-		List<String> wxEnterpriseIds = wxEnterpriseIdDTOs.stream().map(s->s.getWxEnterpriseId()).collect(Collectors.toList());
-		
+			if(CollectionUtil.isNotEmpty(wxEnterpriseIdDTOs)){
+				wxEnterpriseIds = wxEnterpriseIdDTOs.stream().map(s->s.getWxEnterpriseId()).collect(Collectors.toList());
+			}
+		}
 		Page<YwWxEnterpriseDTO> page = wxEnterpriseApiService.list(pageInfo,keyword,wxEnterpriseIds,gicContactHelper,version);
 		PageResult<YwWxEnterpriseDTO> pageVo = new PageResult<>();
 		List<YwWxEnterpriseDTO> list = EntityUtil.changeEntityListByJSON(YwWxEnterpriseDTO.class, page.getResult());