应用列表过滤商户基础应用修复

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

@@ -199,9 +199,11 @@ public class MenuController {
         if (result.isSuccess()) {
             //过滤商户基础应用
             List<MenuDTO> appMenuList = result.getResult();
-            appMenuList = appMenuList.stream()
-                    .filter(e -> !EnterpriseBasicAppUtils.ENTERPRISE_BASIC_APP_CODE.equals(e.getMenuCode()))
-                    .collect(Collectors.toList());
+            if (CollectionUtils.isNotEmpty(appMenuList)) {
+                appMenuList = appMenuList.stream()
+                        .filter(e -> !EnterpriseBasicAppUtils.ENTERPRISE_BASIC_APP_CODE.equals(e.getMenuCode()))
+                        .collect(Collectors.toList());
+            }
             return RestResponse
                     .success(changePageListToTree(MenuLevelConstants.FIRST_LEVEL_PARENT_ID, appMenuList));
         }

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

@@ -7,6 +7,7 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 import com.gic.auth.web.utils.EnterpriseBasicAppUtils;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -74,9 +75,11 @@ public class RoleController {
                     .listAppPageOfHasBuy(UserDetailUtils.getUserDetail().getEnterpriseId());
             //过滤商户基础应用
             List<MenuDTO> appMenuList = appResult.getResult();
-            appMenuList = appMenuList.stream()
-                    .filter(e -> !EnterpriseBasicAppUtils.ENTERPRISE_BASIC_APP_CODE.equals(e.getMenuCode()))
-                    .collect(Collectors.toList());
+            if (CollectionUtils.isNotEmpty(appMenuList)) {
+                appMenuList = appMenuList.stream()
+                        .filter(e -> !EnterpriseBasicAppUtils.ENTERPRISE_BASIC_APP_CODE.equals(e.getMenuCode()))
+                        .collect(Collectors.toList());
+            }
 
             vo.setAppMap(
                     changeListToSelectTree(MenuLevelConstants.FIRST_LEVEL_PARENT_ID, appMenuList, gicMap));
@@ -152,9 +155,11 @@ public class RoleController {
                 .listAppPageOfHasBuy(UserDetailUtils.getUserDetail().getEnterpriseId());
         if (result.isSuccess()) {
             List<MenuDTO> menuList = result.getResult();
-            menuList = menuList.stream()
-                    .filter(e -> !EnterpriseBasicAppUtils.ENTERPRISE_BASIC_APP_CODE.equals(e.getMenuCode()))
-                    .collect(Collectors.toList());
+            if (CollectionUtils.isNotEmpty(menuList)) {
+                menuList = menuList.stream()
+                        .filter(e -> !EnterpriseBasicAppUtils.ENTERPRISE_BASIC_APP_CODE.equals(e.getMenuCode()))
+                        .collect(Collectors.toList());
+            }
             return RestResponse.success(changeListToTree(MenuLevelConstants.FIRST_LEVEL_PARENT_ID, menuList));
         }
         return EnterpriseRestResponse.failure(result);