diff --git a/src/main/java/com/jsh/erp/controller/AppController.java b/src/main/java/com/jsh/erp/controller/AppController.java index d695cdac..12ce86a7 100644 --- a/src/main/java/com/jsh/erp/controller/AppController.java +++ b/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 dataList = appService.findRoleAPP(); + List dataListApp = appService.findRoleAPP(); //开始拼接json数据 JSONObject outer = new JSONObject(); outer.put("id", 1); @@ -165,26 +171,48 @@ public class AppController { outer.put("state", "open"); //存放数据json数组 JSONArray dataArray = new JSONArray(); - if (null != dataList) { - for (App app : dataList) { - if(!("系统管理").equals(app.getName())) { - JSONObject item = new JSONObject(); - item.put("id", app.getId()); - item.put("text", app.getName()); - //勾选判断1 - Boolean flag = false; - try { - flag = userBusinessService.checkIsUserBusinessExist(type, keyId, "[" + app.getId().toString() + "]"); - } catch (Exception e) { - logger.error(">>>>>>>>>>>>>>>>>设置角色对应的应用：类型" + type + " KeyId为： " + keyId + " 存在异常！"); + if (null != dataListApp) { + //根据条件从列表里面移除"系统管理" + List dataList = new ArrayList(); + 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 (flag == true) { - item.put("checked", true); + if(("admin").equals(loginName)) { + dataList.add(appOne); + } else { + if(!("系统管理").equals(appOne.getName())) { + dataList.add(appOne); + } } - //结束 - dataArray.add(item); + } else { + dataList.add(appOne); } } + + //筛选应用列表 + for (App app : dataList) { + JSONObject item = new JSONObject(); + item.put("id", app.getId()); + item.put("text", app.getName()); + //勾选判断1 + Boolean flag = false; + try { + flag = userBusinessService.checkIsUserBusinessExist(type, keyId, "[" + app.getId().toString() + "]"); + } catch (Exception e) { + logger.error(">>>>>>>>>>>>>>>>>设置角色对应的应用：类型" + type + " KeyId为： " + keyId + " 存在异常！"); + } + if (flag == true) { + item.put("checked", true); + } + //结束 + dataArray.add(item); + } } outer.put("children", dataArray); arr.add(outer); diff --git a/src/main/java/com/jsh/erp/controller/FunctionsController.java b/src/main/java/com/jsh/erp/controller/FunctionsController.java index 87a8812b..8fc97d22 100644 --- a/src/main/java/com/jsh/erp/controller/FunctionsController.java +++ b/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 dataList = functionsService.findRoleFunctions("0"); + List dataListFun = functionsService.findRoleFunctions("0"); //开始拼接json数据 JSONObject outer = new JSONObject(); outer.put("id", 1); @@ -129,108 +135,130 @@ public class FunctionsController { outer.put("state", "open"); //存放数据json数组 JSONArray dataArray = new JSONArray(); - if (null != dataList) { + if (null != dataListFun) { + //根据条件从列表里面移除"系统管理" + List dataList = new ArrayList(); + 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()); + JSONObject item = new JSONObject(); + item.put("id", functions.getId()); + item.put("text", functions.getName()); - //勾选判断1 - Boolean flag = false; - try { - flag = userBusinessService.checkIsUserBusinessExist(type, keyId, "[" + functions.getId().toString() + "]"); - } catch (Exception e) { - logger.error(">>>>>>>>>>>>>>>>>设置角色对应的功能：类型" + type + " KeyId为： " + keyId + " 存在异常！"); - } - if (flag == true) { - item.put("checked", true); - } - //结束 + //勾选判断1 + Boolean flag = false; + try { + flag = userBusinessService.checkIsUserBusinessExist(type, keyId, "[" + functions.getId().toString() + "]"); + } catch (Exception e) { + logger.error(">>>>>>>>>>>>>>>>>设置角色对应的功能：类型" + type + " KeyId为： " + keyId + " 存在异常！"); + } + if (flag == true) { + item.put("checked", true); + } + //结束 - List dataList1 = functionsService.findRoleFunctions(functions.getNumber()); - JSONArray dataArray1 = new JSONArray(); - if (null != dataList1) { + List dataList1 = functionsService.findRoleFunctions(functions.getNumber()); + JSONArray dataArray1 = new JSONArray(); + if (null != dataList1) { - for (Functions functions1 : dataList1) { - item.put("state", "open"); //如果不为空，节点不展开 - JSONObject item1 = new JSONObject(); - item1.put("id", functions1.getId()); - item1.put("text", functions1.getName()); + for (Functions functions1 : dataList1) { + item.put("state", "open"); //如果不为空，节点不展开 + JSONObject item1 = new JSONObject(); + item1.put("id", functions1.getId()); + item1.put("text", functions1.getName()); - //勾选判断2 - //Boolean flag = false; - try { - flag = userBusinessService.checkIsUserBusinessExist(type, keyId, "[" + functions1.getId().toString() + "]"); - } catch (Exception e) { - logger.error(">>>>>>>>>>>>>>>>>设置角色对应的功能：类型" + type + " KeyId为： " + keyId + " 存在异常！"); - } - if (flag == true) { - item1.put("checked", true); - } - //结束 + //勾选判断2 + //Boolean flag = false; + try { + flag = userBusinessService.checkIsUserBusinessExist(type, keyId, "[" + functions1.getId().toString() + "]"); + } catch (Exception e) { + logger.error(">>>>>>>>>>>>>>>>>设置角色对应的功能：类型" + type + " KeyId为： " + keyId + " 存在异常！"); + } + if (flag == true) { + item1.put("checked", true); + } + //结束 - List dataList2 = functionsService.findRoleFunctions(functions1.getNumber()); - JSONArray dataArray2 = new JSONArray(); - if (null != dataList2) { + List dataList2 = functionsService.findRoleFunctions(functions1.getNumber()); + JSONArray dataArray2 = new JSONArray(); + if (null != dataList2) { - for (Functions functions2 : dataList2) { - item1.put("state", "closed"); //如果不为空，节点不展开 - JSONObject item2 = new JSONObject(); - item2.put("id", functions2.getId()); - item2.put("text", functions2.getName()); + for (Functions functions2 : dataList2) { + item1.put("state", "closed"); //如果不为空，节点不展开 + JSONObject item2 = new JSONObject(); + item2.put("id", functions2.getId()); + item2.put("text", functions2.getName()); - //勾选判断3 - //Boolean flag = false; - try { - flag = userBusinessService.checkIsUserBusinessExist(type, keyId, "[" + functions2.getId().toString() + "]"); - } catch (Exception e) { - logger.error(">>>>>>>>>>>>>>>>>设置角色对应的功能：类型" + type + " KeyId为： " + keyId + " 存在异常！"); - } - if (flag == true) { - item2.put("checked", true); - } - //结束 - - List dataList3 = functionsService.findRoleFunctions(functions2.getNumber()); - JSONArray dataArray3 = new JSONArray(); - if (null != dataList3) { - - for (Functions functions3 : dataList3) { - item2.put("state", "closed"); //如果不为空，节点不展开 - JSONObject item3 = new JSONObject(); - item3.put("id", functions3.getId()); - item3.put("text", functions3.getName()); - - //勾选判断4 - //Boolean flag = false; - try { - flag = userBusinessService.checkIsUserBusinessExist(type, keyId, "[" + functions3.getId().toString() + "]"); - } catch (Exception e) { - logger.error(">>>>>>>>>>>>>>>>>设置角色对应的功能：类型" + type + " KeyId为： " + keyId + " 存在异常！"); - } - if (flag == true) { - item3.put("checked", true); - } - //结束 - - dataArray3.add(item3); - item2.put("children", dataArray3); - } - } - - dataArray2.add(item2); - item1.put("children", dataArray2); + //勾选判断3 + //Boolean flag = false; + try { + flag = userBusinessService.checkIsUserBusinessExist(type, keyId, "[" + functions2.getId().toString() + "]"); + } catch (Exception e) { + logger.error(">>>>>>>>>>>>>>>>>设置角色对应的功能：类型" + type + " KeyId为： " + keyId + " 存在异常！"); } - } + if (flag == true) { + item2.put("checked", true); + } + //结束 - dataArray1.add(item1); - item.put("children", dataArray1); + List dataList3 = functionsService.findRoleFunctions(functions2.getNumber()); + JSONArray dataArray3 = new JSONArray(); + if (null != dataList3) { + + for (Functions functions3 : dataList3) { + item2.put("state", "closed"); //如果不为空，节点不展开 + JSONObject item3 = new JSONObject(); + item3.put("id", functions3.getId()); + item3.put("text", functions3.getName()); + + //勾选判断4 + //Boolean flag = false; + try { + flag = userBusinessService.checkIsUserBusinessExist(type, keyId, "[" + functions3.getId().toString() + "]"); + } catch (Exception e) { + logger.error(">>>>>>>>>>>>>>>>>设置角色对应的功能：类型" + type + " KeyId为： " + keyId + " 存在异常！"); + } + if (flag == true) { + item3.put("checked", true); + } + //结束 + + dataArray3.add(item3); + item2.put("children", dataArray3); + } + } + + dataArray2.add(item2); + item1.put("children", dataArray2); + } } + dataArray1.add(item1); + item.put("children", dataArray1); } - dataArray.add(item); + } + dataArray.add(item); } outer.put("children", dataArray); arr.add(outer);