111

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

 package com.gic.haoban.manage.web.controller;
 
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+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.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import cn.hutool.core.collection.CollectionUtil;
+
 import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.manage.api.dto.ApplicationDTO;
+import com.gic.haoban.manage.api.dto.ApplicationSettingDTO;
 import com.gic.haoban.manage.api.service.ApplicationApiService;
+import com.gic.haoban.manage.api.service.ApplicationSettingApiService;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 
 @RestController
@@ -18,18 +24,33 @@ public class ApplicationController extends WebBaseController{
 	
 	@Autowired
 	private ApplicationApiService applicationApiService;
+	@Autowired
+	private ApplicationSettingApiService applicationSettingApiService;
 	
 	@RequestMapping("application-list")
-	public HaobanResponse applicationList() {
+	public HaobanResponse applicationList(String wxEnterpriseId) {
 		
 		List<ApplicationDTO> list = applicationApiService.listApplication();
+
+		List<String> applicationIds = list.stream().map(s->s.getApplicationId()).collect(Collectors.toList());
+		List<ApplicationSettingDTO> settings = applicationSettingApiService.listOpenByWxEnterpriseIdAndApplicationIds(wxEnterpriseId, applicationIds);
+		List<String> openApplicationIds  = new ArrayList<String>();
+		if(CollectionUtil.isNotEmpty(settings)){
+			openApplicationIds = settings.stream().map(s->s.getApplicationId()).collect(Collectors.toList());
+		}
 		Iterator<ApplicationDTO> it = list.listIterator();
 		while(it.hasNext()){
 			ApplicationDTO app = it.next();
+			if(!openApplicationIds.contains(app.getApplicationId())){
+				it.remove();
+				continue ;
+			}
 			if("通讯录".equals(app.getApplicationName())){
 				it.remove();
+				continue ;
 			}
 		}
+		
 		return resultResponse(HaoBanErrCode.ERR_1,list);
 		
 	}