观云台小程序

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/auth/DataAuthUtils.java

@@ -88,17 +88,14 @@ public class DataAuthUtils {
     public List<MbrVo> getMbrArea(Integer userId, Integer enterpriseId){
         ServiceResponse<DataAuthDTO> response = this.dataAuthApiService.ggetDataAuthByUserId(enterpriseId, userId);
         if(response.isSuccess() && response.getResult() != null){
-            ServiceResponse<List<OwnerMemberCardDTO>> result = memberCardApiService.getAll(UserDetailUtils.getUserDetail().getEnterpriseId());
+            ServiceResponse<List<OwnerMemberCardDTO>> result = memberCardApiService.getAll(enterpriseId);
             List<String> cards = Arrays.asList(response.getResult().getMemberCardAuth().split("_"));
             if(result.isSuccess() && CollectionUtils.isNotEmpty(result.getResult())){
-                return result.getResult().stream().map(ownerMemberCardDTO -> {
-                    if(cards.contains(ownerMemberCardDTO.getId().toString())){
-                        MbrVo vo = new MbrVo();
-                        vo.setMbrAreaId(ownerMemberCardDTO.getId().toString());
-                        vo.setMbrAreaName(ownerMemberCardDTO.getCardName());
-                        return vo;
-                    }
-                    return null;
+                return result.getResult().stream().filter(dto ->cards.contains(dto.getId()+"")).map(ownerMemberCardDTO -> {
+                    MbrVo vo = new MbrVo();
+                    vo.setMbrAreaId(ownerMemberCardDTO.getId().toString());
+                    vo.setMbrAreaName(ownerMemberCardDTO.getCardName());
+                    return vo;
                 }).collect(Collectors.toList());
             }
         }

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/IndexController.java

@@ -2,7 +2,9 @@ package com.gic.cloud.web.controller;
 
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.cloud.service.IndexApiService;
+import com.gic.cloud.web.auth.DataAuthUtils;
 import com.gic.cloud.web.qo.DateTypeQo;
+import com.gic.cloud.web.vo.MbrVo;
 import com.gic.cloud.web.vo.index.IndexSalesVo;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.webapi.reponse.RestResponse;
@@ -21,10 +23,13 @@ public class IndexController {
     private IndexSalesApiService indexSalesApiService;
     @Autowired
     private StoreSearchUtils storeSearchUtils;
+    @Autowired
+    private DataAuthUtils dataAuthUtils;
 
     @RequestMapping("index-mbr")
     public RestResponse indexMbr(Integer enterpriseId, Integer userId){
-
+        List<MbrVo> mbrArea = this.dataAuthUtils.getMbrArea(userId, enterpriseId);
+        return RestResponse.success(mbrArea);
     }
 
     @RequestMapping("index-sales")