权限集和日志应用列表过滤商户基础服务

gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/MenuController.java

@@ -6,6 +6,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 import com.gic.auth.constant.MenuProjectConstants;
+import com.gic.auth.web.utils.EnterpriseBasicAppUtils;
 import com.gic.log.api.dto.LogSearchDTO;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -196,8 +197,13 @@ public class MenuController {
                     null);
         }
         if (result.isSuccess()) {
+            //过滤商户基础应用
+            List<MenuDTO> appMenuList = result.getResult();
+            appMenuList = appMenuList.stream()
+                    .filter(e -> !e.getMenuCode().equals(EnterpriseBasicAppUtils.ENTERPRISE_BASIC_APP_CODE))
+                    .collect(Collectors.toList());
             return RestResponse
-                    .success(changePageListToTree(MenuLevelConstants.FIRST_LEVEL_PARENT_ID, result.getResult()));
+                    .success(changePageListToTree(MenuLevelConstants.FIRST_LEVEL_PARENT_ID, appMenuList));
         }
         return EnterpriseRestResponse.failure(result);
     }

gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/RoleController.java

@@ -4,7 +4,9 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
+import com.gic.auth.web.utils.EnterpriseBasicAppUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -70,9 +72,14 @@ public class RoleController {
             //app已购买应用
             ServiceResponse<List<MenuDTO>> appResult = menuApiService
                     .listAppPageOfHasBuy(UserDetailUtils.getUserDetail().getEnterpriseId());
+            //过滤商户基础应用
+            List<MenuDTO> appMenuList = appResult.getResult();
+            appMenuList = appMenuList.stream()
+                    .filter(e -> !e.getMenuCode().equals(EnterpriseBasicAppUtils.ENTERPRISE_BASIC_APP_CODE))
+                    .collect(Collectors.toList());
 
             vo.setAppMap(
-                    changeListToSelectTree(MenuLevelConstants.FIRST_LEVEL_PARENT_ID, appResult.getResult(), gicMap));
+                    changeListToSelectTree(MenuLevelConstants.FIRST_LEVEL_PARENT_ID, appMenuList, gicMap));
             return RestResponse.success(vo);
         }
         return EnterpriseRestResponse.failure(roleResult);
@@ -144,7 +151,11 @@ public class RoleController {
         ServiceResponse<List<MenuDTO>> result = menuApiService
                 .listAppPageOfHasBuy(UserDetailUtils.getUserDetail().getEnterpriseId());
         if (result.isSuccess()) {
-            return RestResponse.success(changeListToTree(MenuLevelConstants.FIRST_LEVEL_PARENT_ID, result.getResult()));
+            List<MenuDTO> menuList = result.getResult();
+            menuList = menuList.stream()
+                    .filter(e -> !e.getMenuCode().equals(EnterpriseBasicAppUtils.ENTERPRISE_BASIC_APP_CODE))
+                    .collect(Collectors.toList());
+            return RestResponse.success(changeListToTree(MenuLevelConstants.FIRST_LEVEL_PARENT_ID, menuList));
         }
         return EnterpriseRestResponse.failure(result);
     }

gic-platform-auth-web/src/main/java/com/gic/auth/web/utils/EnterpriseBasicAppUtils.java

+package com.gic.auth.web.utils;
+/**
+ * 商户基础服务应用code
+ * @ClassName: EnterpriseBasicAppUtils

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/5/9 9:36 AM

+ */
+public class EnterpriseBasicAppUtils {
+
+    /**
+     * 商户基础服务code，用于过滤应用列表
+     */
+    public static final String ENTERPRISE_BASIC_APP_CODE = "enterpriseBasicApp";
+
+}