From ba4819f3a81cf34bfc6c39c8648fa5d0910277a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Tue, 18 May 2021 20:17:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsh/erp/controller/UserController.java | 3 +++ .../com/jsh/erp/service/user/UserService.java | 25 +++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java index 9bd5d3c9..db948d45 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java @@ -140,8 +140,11 @@ public class UserController { logService.insertLogWithUserId(user.getId(), user.getTenantId(), "用户", new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_LOGIN).append(user.getLoginName()).toString(), ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest()); + JSONArray btnStrArr = userService.getBtnStrArrById(user.getId()); data.put("token", token); data.put("user", user); + //用户的按钮权限 + data.put("userBtn", btnStrArr); } res.code = 200; res.data = data; diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java index 527860bd..1c073005 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java @@ -754,4 +754,29 @@ public class UserService { } return userId; } + + /** + * 用户的按钮权限 + * @param userId + * @return + * @throws Exception + */ + public JSONArray getBtnStrArrById(Long userId) throws Exception { + JSONArray btnStrArr = new JSONArray(); + List userRoleList = userBusinessService.getBasicData(userId.toString(), "UserRole"); + if(userRoleList!=null && userRoleList.size()>0) { + String roleValue = userRoleList.get(0).getValue(); + if(StringUtil.isNotEmpty(roleValue) && roleValue.indexOf("[")>-1 && roleValue.indexOf("]")>-1){ + roleValue = roleValue.replace("[", "").replace("]", ""); //角色id-单个 + List roleFunctionsList = userBusinessService.getBasicData(roleValue, "RoleFunctions"); + if(roleFunctionsList!=null && roleFunctionsList.size()>0) { + String btnStr = roleFunctionsList.get(0).getBtnStr(); + if(StringUtil.isNotEmpty(btnStr)){ + btnStrArr = JSONArray.parseArray(btnStr); + } + } + } + } + return btnStrArr; + } }