解决权限配置过滤的bug

src/main/java/com/jsh/erp/controller/AppController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.jsh.erp.constants.ExceptionConstants;
 import com.jsh.erp.datasource.entities.App;
+import com.jsh.erp.datasource.entities.User;
 import com.jsh.erp.datasource.entities.UserBusiness;
 import com.jsh.erp.exception.BusinessRunTimeException;
 import com.jsh.erp.service.app.AppService;
@@ -12,12 +13,14 @@ import com.jsh.erp.utils.BaseResponseInfo;
 import com.jsh.erp.utils.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.io.*;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
 
@@ -29,6 +32,9 @@ import java.util.Properties;
 public class AppController {
     private Logger logger = LoggerFactory.getLogger(AppController.class);
 
+    @Value("${mybatis-plus.status}")
+    private String mybatisPlusStatus;
+
     @Resource
     private AppService appService;
 
@@ -157,7 +163,7 @@ public class AppController {
                                   HttpServletRequest request) {
         JSONArray arr = new JSONArray();
         try {
-            List<App> dataList = appService.findRoleAPP();
+            List<App> dataListApp = appService.findRoleAPP();
             //开始拼接json数据
             JSONObject outer = new JSONObject();
             outer.put("id", 1);
@@ -165,9 +171,32 @@ public class AppController {
             outer.put("state", "open");
             //存放数据json数组
             JSONArray dataArray = new JSONArray();
-            if (null != dataList) {
+            if (null != dataListApp) {
+                //根据条件从列表里面移除"系统管理"
+                List<App> dataList = new ArrayList<App>();
+                for (App appOne : dataListApp) {
+                    if(("open").equals(mybatisPlusStatus)){
+                        //从session中获取租户id
+                        String loginName = null;
+                        Object userInfo = request.getSession().getAttribute("user");
+                        if(userInfo != null) {
+                            User user = (User) userInfo;
+                            loginName = user.getLoginame();
+                        }
+                        if(("admin").equals(loginName)) {
+                            dataList.add(appOne);
+                        } else {
+                            if(!("系统管理").equals(appOne.getName())) {
+                                dataList.add(appOne);
+                            }
+                        }
+                    } else {
+                        dataList.add(appOne);
+                    }
+                }
+
+                //筛选应用列表
                 for (App app : dataList) {
-                    if(!("系统管理").equals(app.getName())) {
                     JSONObject item = new JSONObject();
                     item.put("id", app.getId());
                     item.put("text", app.getName());
@@ -185,7 +214,6 @@ public class AppController {
                     dataArray.add(item);
                 }
             }
-            }
             outer.put("children", dataArray);
             arr.add(outer);
         } catch (Exception e) {

src/main/java/com/jsh/erp/controller/FunctionsController.java

@@ -4,18 +4,21 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.jsh.erp.constants.ExceptionConstants;
 import com.jsh.erp.datasource.entities.Functions;
+import com.jsh.erp.datasource.entities.User;
 import com.jsh.erp.exception.BusinessRunTimeException;
 import com.jsh.erp.service.functions.FunctionsService;
 import com.jsh.erp.service.userBusiness.UserBusinessService;
 import com.jsh.erp.utils.BaseResponseInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.dao.DataAccessException;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -26,6 +29,9 @@ import java.util.List;
 public class FunctionsController {
     private Logger logger = LoggerFactory.getLogger(FunctionsController.class);
 
+    @Value("${mybatis-plus.status}")
+    private String mybatisPlusStatus;
+
     @Resource
     private FunctionsService functionsService;
 
@@ -121,7 +127,7 @@ public class FunctionsController {
                                  HttpServletRequest request) {
         JSONArray arr = new JSONArray();
         try {
-            List<Functions> dataList = functionsService.findRoleFunctions("0");
+            List<Functions> dataListFun = functionsService.findRoleFunctions("0");
             //开始拼接json数据
             JSONObject outer = new JSONObject();
             outer.put("id", 1);
@@ -129,9 +135,32 @@ public class FunctionsController {
             outer.put("state", "open");
             //存放数据json数组
             JSONArray dataArray = new JSONArray();
-            if (null != dataList) {
+            if (null != dataListFun) {
+                //根据条件从列表里面移除"系统管理"
+                List<Functions> dataList = new ArrayList<Functions>();
+                for (Functions fun : dataListFun) {
+                    if(("open").equals(mybatisPlusStatus)){
+                        //从session中获取租户id
+                        String loginName = null;
+                        Object userInfo = request.getSession().getAttribute("user");
+                        if(userInfo != null) {
+                            User user = (User) userInfo;
+                            loginName = user.getLoginame();
+                        }
+                        if(("admin").equals(loginName)) {
+                            dataList.add(fun);
+                        } else {
+                            if(!("系统管理").equals(fun.getName())) {
+                                dataList.add(fun);
+                            }
+                        }
+                    } else {
+                        dataList.add(fun);
+                    }
+                }
+
+                //筛选功能列表
                 for (Functions functions : dataList) {
-                    if(!("系统管理").equals(functions.getName())) {
                     JSONObject item = new JSONObject();
                     item.put("id", functions.getId());
                     item.put("text", functions.getName());
@@ -231,7 +260,6 @@ public class FunctionsController {
                     }
                     dataArray.add(item);
                 }
-                }
                 outer.put("children", dataArray);
                 arr.add(outer);
             }