Browse Source

【BI商业智能】【系统管理】【限制普通用户权限】

zhaoy 6 years ago
parent
commit
e0337e09bb

+ 7 - 1
bi-server/src/main/java/com/usoftchina/bi/server/service/common/MessageLogService.java

@@ -1,6 +1,8 @@
 package com.usoftchina.bi.server.service.common;
 
 import com.github.pagehelper.PageInfo;
+import com.usoftchina.bi.core.base.BaseContextHolder;
+import com.usoftchina.bi.core.base.RoleConstant;
 import com.usoftchina.bi.core.base.TestPage;
 import com.usoftchina.bi.server.dao.common.MessageLogMapper;
 import com.usoftchina.bi.server.model.po.MessageLog;
@@ -8,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -21,7 +24,10 @@ public class MessageLogService {
     private MessageLogMapper messageLogMapper;
 
     public PageInfo<MessageLog> list(String condition, TestPage testPage) {
-        List<MessageLog> messageLogList = messageLogMapper.list(condition, testPage.enablePaging());
+        List<MessageLog> messageLogList = new ArrayList<>();
+        if (RoleConstant.SUPER_ADMIN.getRole().equals(BaseContextHolder.getRole())){
+            messageLogList = messageLogMapper.list(condition, testPage.enablePaging());
+        }
         return new PageInfo<MessageLog>(messageLogList);
     }
 

+ 3 - 1
bi-server/src/main/java/com/usoftchina/bi/server/service/dashboard/DashBoardMenuService.java

@@ -36,7 +36,9 @@ public class DashBoardMenuService {
     private List<DashboardMenuRespDTO> getData(int userId, int id, String role){
         List<DashboardMenuRespDTO> dashboardMenuRespDTOList = new ArrayList<>();
         if (!RoleConstant.SUPER_ADMIN.getRole().equals(role)) {
-            dashboardMenuRespDTOList = dashBoardMenuMapper.getMenuById(userId, id);
+            if (RoleConstant.SUPER_ADMIN.getRole().equals(role)) {
+                dashboardMenuRespDTOList = dashBoardMenuMapper.getMenuById(userId, id);
+            }
         }else {
             dashboardMenuRespDTOList = dashBoardMenuMapper.getMenuWithNoLimit(id);
         }

+ 10 - 2
bi-server/src/main/java/com/usoftchina/bi/server/service/user/UserService.java

@@ -3,6 +3,7 @@ package com.usoftchina.bi.server.service.user;
 import com.usoftchina.bi.core.base.BaseContextHolder;
 import com.usoftchina.bi.core.base.RepCode;
 import com.usoftchina.bi.core.base.RepEntity;
+import com.usoftchina.bi.core.base.RoleConstant;
 import com.usoftchina.bi.core.exception.MyException;
 import com.usoftchina.bi.core.jdbc.DynamicDataSourceContextHolder;
 import com.usoftchina.bi.core.utils.EncryUtil;
@@ -24,6 +25,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -159,7 +161,10 @@ public class UserService {
      */
     @Cacheable(value = "userList")
     public RepEntity getUserList(){
-        List<User> userList = userMapper.getUserList();
+        List<User> userList = new ArrayList<>();
+        if (RoleConstant.SUPER_ADMIN.getRole().equals(BaseContextHolder.getRole())){
+            userList = userMapper.getUserList();
+        }
         return new RepEntity(RepCode.success, userList);
     }
 
@@ -208,7 +213,10 @@ public class UserService {
     查询用户组
      */
     public RepEntity getUserGroup(){
-        List<UserGroup> userGroup= userMapper.getUserGroupList();
+        List<UserGroup> userGroup= new ArrayList<>();
+        if (RoleConstant.SUPER_ADMIN.getRole().equals(BaseContextHolder.getRole())) {
+            userGroup= userMapper.getUserGroupList();
+        }
         return new RepEntity(RepCode.success, userGroup);
     }