1. 权限合集 部门表别名名称

chushang-common/chushang-common-data-scope/src/main/java/com/chushang/datascope/annotation/DataScope.java

@@ -10,9 +10,9 @@ import java.lang.annotation.*;
 public @interface DataScope
 {
     /**
-     * 主表的别名, 用于查询部门id
+     * 用于查询部门id的表别名
      */
-    String tableAlias() default "";
+    String deptAlias() default "";
 
     /**
      * 用户表的别名, 用于查询userId
@@ -23,4 +23,4 @@ public @interface DataScope
 
     ScopeKeyWord scopeKey() default ScopeKeyWord.AND;
 
-}
+}

chushang-common/chushang-common-data-scope/src/main/java/com/chushang/datascope/aspect/DataScopeAspect.java

@@ -56,7 +56,7 @@ public class DataScopeAspect {
                 String permission = StringUtils.defaultIfEmpty(dataScope.permission(),
                         SecurityContextHolder.getPermission());
                 ScopeKeyWord scopeKeyWord = dataScope.scopeKey();
-                dataScopeFilter(joinPoint, scopes, dataScope.tableAlias(),
+                dataScopeFilter(joinPoint, scopes, dataScope.deptAlias(),
                         dataScope.userAlias(), permission, userId, scopeKeyWord);
             }
         }

chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java

@@ -21,7 +21,7 @@ import com.chushang.inspection.project.mapper.WrkProjectMapper;
 @Service
 public class WrkProjectService extends ServiceImpl<WrkProjectMapper, WrkProject> implements IService<WrkProject> {
 
-    @DataScope(tableAlias= "wrk_project")
+    @DataScope
     public PageResult pageList(WrkProject project, CommonParam commonParam) {
         LambdaQueryWrapper<WrkProject> queryWrapper = WrapperUtils.builder(project, project, commonParam);
         IPage<WrkProject> page = this.page(

chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/ISysPostService.java

@@ -18,7 +18,7 @@ import java.util.List;
  * @date: 2024/5/9 15:53
  */
 public interface ISysPostService extends IService<SysPost> {
-    @DataScope(tableAlias = "d")
+    @DataScope(deptAlias = "d")
     default PageResult pagePostList(SysPost sysPost, CommonParam commonParam){
         IPage<SysPost> page = this.page(
                 new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(commonParam.getPage(), commonParam.getLimit()),

chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/impl/SysDeptServiceImpl.java

@@ -41,7 +41,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
     ISysUserService userService;
 
     @Override
-    @DataScope(tableAlias = "d")
+    @DataScope(deptAlias = "d")
     public List<SysDept> selectDeptList(ListDeptDTO listDept) {
         return baseMapper.selectDeptList(listDept);
     }

chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/impl/SysRoleServiceImpl.java

@@ -8,7 +8,6 @@ import com.chushang.common.core.util.StringUtils;
 import com.chushang.common.core.web.AjaxResult;
 import com.chushang.common.mybatis.utils.PageResult;
 import com.chushang.datascope.annotation.DataScope;
-import com.chushang.security.entity.po.DataScopeEntity;
 import com.chushang.security.utils.SecurityUtils;
 import com.chushang.system.mapper.SysRoleMapper;
 import com.chushang.system.service.ISysRoleMenuService;
@@ -51,7 +50,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
     ISysUserRoleService userRoleService;
 
     @Override
-    @DataScope(tableAlias = "r")
+    @DataScope(deptAlias = "r")
     public List<SysRole> selectRoleAll(SysRole sysRole) {
         return baseMapper.selectRoleList(sysRole);
     }
@@ -74,7 +73,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
     }
 
     @Override
-    @DataScope(tableAlias = "r")
+    @DataScope(deptAlias = "r")
     public AjaxResult selectRoleList(ListRoleDTO listRole) {
         com.baomidou.mybatisplus.extension.plugins.pagination.Page<SysRole> page = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(listRole.getPage(), listRole.getLimit());
         List<SysRole> listAfDataVOList = baseMapper.listRole(listRole, page);
@@ -87,7 +86,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
     }
 
     @Override
-    @DataScope(tableAlias = "r")
+    @DataScope(deptAlias = "r")
     public void checkRoleDataScope(SysRole role) {
         // 登录用户非管理员时进行判断 , 判断当前登录用户的角色是否包含以下角色
         if (!SecurityUtils.isAdmin()) {

chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/impl/SysUserServiceImpl.java

@@ -50,7 +50,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     ISysPostService sysPostService;
 
     @Override
-    @DataScope(tableAlias = "u", userAlias = "u")
+    @DataScope(deptAlias = "u", userAlias = "u")
     public AjaxResult listUser(ListUserDTO listUser) {
         com.baomidou.mybatisplus.extension.plugins.pagination.Page<SysUser> page = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(listUser.getPage(),listUser.getLimit());
 
@@ -82,7 +82,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      * 判断当前登录用户 有没有 被修改用户的权限
      */
     @Override
-    @DataScope(tableAlias = "d", userAlias = "u")
+    @DataScope(deptAlias = "d", userAlias = "u")
     public void checkUserDataScope(SysUser user)
     {
         //登录用户非管理员时进行判断 && 待操作的用户也不为管理员
@@ -151,7 +151,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     }
 
     @Override
-    @DataScope(tableAlias = "d", userAlias = "u")
+    @DataScope(deptAlias = "d", userAlias = "u")
     public AjaxResult selectAllocatedList(ListUserDTO listUser) {
         com.baomidou.mybatisplus.extension.plugins.pagination.Page<SysUser> page =
                 new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(listUser.getPage(),listUser.getLimit());
@@ -165,7 +165,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     }
 
     @Override
-    @DataScope(tableAlias = "d", userAlias = "u")
+    @DataScope(deptAlias = "d", userAlias = "u")
     public AjaxResult selectUnallocatedList(ListUserDTO listUser) {
         com.baomidou.mybatisplus.extension.plugins.pagination.Page<SysUser> page = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(listUser.getPage(),listUser.getLimit());
 

chushang-modules/chushang-module-task/task-service/src/main/java/com/chushang/task/service/TaskInfoService.java

@@ -1,12 +1,10 @@
 package com.chushang.task.service;
 
-import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.chushang.common.core.constant.ServiceConstant;
 import com.chushang.common.mq.produce.MqProduceService;
 import com.chushang.common.mybatis.page.CommonParam;
 import com.chushang.common.mybatis.utils.PageResult;
@@ -33,7 +31,7 @@ public class TaskInfoService extends ServiceImpl<TaskInfoMapper, TaskInfo> imple
     @Resource
     MqProduceService<TaskInfo> mqProduceService;
 
-    @DataScope(tableAlias = "t")
+    @DataScope(deptAlias = "t")
     public PageResult pagePostList(TaskInfo sysPost, CommonParam commonParam){
         IPage<TaskInfo> page = this.page(
                 new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(commonParam.getPage(), commonParam.getLimit()),