应用状态

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

@@ -11,6 +11,7 @@ import java.util.stream.Collectors;
 
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -21,12 +22,14 @@ import org.springframework.web.bind.annotation.RestController;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.gic.commons.util.CollectionUtil;
 import com.gic.commons.util.EntityUtil;
 import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
 import com.gic.haoban.common.anno.IgnoreLogin;
 import com.gic.haoban.common.utils.AuthWebRequestUtil;
 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.dto.EnterpriseDetailDTO;
 import com.gic.haoban.manage.api.dto.QywxCorpInfoDTO;
 import com.gic.haoban.manage.api.dto.SecretSettingDTO;
@@ -106,14 +109,17 @@ public class ApplicationController extends WebBaseController {
                 }
             }
         }
+        //开启
         List<String> applicationIds = list.stream().map(s -> s.getApplicationId()).collect(Collectors.toList());
+        List<ApplicationSettingDTO> openList = applicationSettingApiService.listOpenByWxEnterpriseIdAndApplicationIds(wxEnterpriseId, applicationIds);
+        List<String> openApplicationIds = openList.stream().map(s -> s.getApplicationId()).collect(Collectors.toList());
         List<ApplicationVO> allList = new ArrayList<>();
         list.forEach(item->{
             ApplicationVO vo = EntityUtil.changeEntity(ApplicationVO.class, item) ;
-            if(applicationIds.contains(vo.getApplicationId())) {
-                vo.setOpenFlag(0);
-            }else {
+            if(openApplicationIds.contains(vo.getApplicationId())) {
                 vo.setOpenFlag(1);
+            }else {
+                vo.setOpenFlag(0);
             }
             allList.add(vo) ;
         });