【BI商业智能】【权限获取】

bi-server/src/main/java/com/usoftchina/bi/server/controller/user/UserController.java

@@ -48,8 +48,8 @@ public class UserController {
     @ApiOperation(value = "查询用户列表", notes = "查询用户列表", response = RepEntity.class)
     @Auth(user = "admin")
     @PostMapping("/getUserList")
-    public RepEntity getUserList(){
-        return userService.getUserList();
+    public RepEntity getUserList(@RequestHeader String token){
+        return userService.getUserList(token);
     }
 
     /*
@@ -91,8 +91,8 @@ public class UserController {
     @ApiOperation(value = "查询用户组列表", notes = "查询用户组列表", response = RepEntity.class)
     @Auth(user = "admin")
     @PostMapping("/getUserGroupList")
-    public RepEntity getUserGroupList(){
-        return userService.getUserGroup();
+    public RepEntity getUserGroupList(@RequestHeader String token){
+        return userService.getUserGroup(token);
     }
 
     /*

bi-server/src/main/java/com/usoftchina/bi/server/service/chart/ChartsUtilService.java

@@ -50,22 +50,22 @@ public class ChartsUtilService {
                 if (tableName == null || "".equals(tableName)) {
                     return "";
                 } else {
-                    return columnNameUtil(userId, baseId, tableName, true, id, -1);
+                    return columnNameUtil(userId, baseId, tableName, true, id, -1, role);
                 }
             } else {
                 //先拿图表创建者权限，在取分发权限
-                String sql = columnNameUtil(createID, baseId, tableName, true, id, -1);
-                return columnNameUtil(userId, baseId, sql, false, id, -1);
+                String sql = columnNameUtil(createID, baseId, tableName, true, id, -1, role);
+                return columnNameUtil(userId, baseId, sql, false, id, -1, role);
             }
         }else {
-            return columnNameUtil(createID, baseId, tableName, true, id, -1);
+            return columnNameUtil(createID, baseId, tableName, true, id, -1, role);
         }
     }
 
-    public String columnNameUtil(int userId, int baseId, String tableName, boolean isOrder, int id, int createBId){
+    public String columnNameUtil(int userId, int baseId, String tableName, boolean isOrder, int id, int createBId, String role){
         //用户不是创建人
         List<String> strList = new ArrayList<>();
-        String role = BaseContextHolder.getRole();
+        //String role = BaseContextHolder.getRole();
         if (isOrder){
             int baseCreateId;
             if (id != 0) {

bi-server/src/main/java/com/usoftchina/bi/server/service/dataSource/DataConnectorService.java

@@ -366,11 +366,12 @@ public class DataConnectorService {
     查询数据源数据
      */
     public RepEntity getConnectorData(String token, BaseToDataInfo baseToDataInfo) {
-
+        Map<String, String> resultMap = GetTokenDataUtil.getTokenData(token);
         int dataId = baseToDataInfo.getId();
         int baseId = getChartsDataUtilService.getBaseIdByConnect(dataId);
         logger.info("切换数据库:{}", baseId);
 
+        String role = resultMap.get("role");
         int id = BaseContextHolder.getUserId();
         int createId = dataConnectorMapper.getCreateIdById(dataId);
         ColumnValuesInfo columnValuesInfo = new ColumnValuesInfo();
@@ -381,7 +382,7 @@ public class DataConnectorService {
         if (RoleConstant.SUPER_ADMIN.getRole().equals(BaseContextHolder.getRole())) {
             id = createId;
         }
-        String sqls = chartsUtilService.columnNameUtil(id, dataId, sql, true, 0, createId);
+        String sqls = chartsUtilService.columnNameUtil(id, dataId, sql, true, 0, createId, role);
 
         try {
             if (!DynamicDataSourceContextHolder.isContainsDataSource(baseId)) {