Просмотр исходного кода

检查计划相关权限修改

hanzhiwei 1 год назад
Родитель
Сommit
12f80f961b

+ 3 - 0
zd-modules/zd-security/src/main/java/com/zd/security/controller/CheckManageController.java

@@ -19,6 +19,7 @@ import com.zd.security.api.vo.CheckHazardInfoVo;
 import com.zd.security.api.vo.CheckManageListVo;
 import com.zd.security.api.vo.CheckManageVo;
 import com.zd.security.entity.*;
+import com.zd.security.scope.DataPermission;
 import com.zd.security.scope.DataPermissionAspect;
 import com.zd.security.service.*;
 import com.zd.security.service.impl.WordService;
@@ -180,6 +181,7 @@ public class CheckManageController extends AbstractController {
      **/
     @ApiOperation("获取巡查计划管理列表(分页)")
     //@DataPermission(permissionStr = PerPrefix.SECURITY_CHECK_MANAGE)
+    @DataPermission
     @PreAuthorize(hasAnyPermi = {PerPrefix.SECURITY_CHECK_MANAGE + PerFun.LIST,PerPrefix.SECURITY_CHECK_MANAGE_1 + PerFun.LIST})
     @PostMapping(value = "/list")
     public ResultData list(@RequestBody QueryCheckManageListParam queryCheckManageListParam) {
@@ -211,6 +213,7 @@ public class CheckManageController extends AbstractController {
      **/
     @ApiOperation("小程序获取巡查计划管理列表(分页)")
     //@DataPermission(permissionStr = PerPrefix.SECURITY_CHECK_MANAGE)
+    @DataPermission
     @PostMapping(value = "/appList")
     public ResultData appList(@RequestBody QueryCheckManageListParam queryCheckManageListParam) {
         lock.lock();

+ 2 - 1
zd-modules/zd-security/src/main/java/com/zd/security/controller/CheckPlanController.java

@@ -170,7 +170,7 @@ public class CheckPlanController extends AbstractController {
     @ApiOperation("获取检查计划列表(分页)")
     //@DataPermission(permissionStr = PerPrefix.SECURITY_CHECK_PLAN)
 //    @DataPermission(roleKey="checkGentle", tableAlias="*")
-    @DataPermission(tableAlias = "m")
+    @DataPermission
     @PreAuthorize(hasAnyPermi = {PerPrefix.SECURITY_CHECK_PLAN + PerFun.LIST,PerPrefix.SECURITY_CHECK_PLAN_1 + PerFun.LIST})
     @PostMapping(value = "/list")
     public ResultData list(@RequestBody QueryCheckPlanListParam queryCheckPlanListParam) {
@@ -242,6 +242,7 @@ public class CheckPlanController extends AbstractController {
     @ApiOperation("小程序获取检查计划列表(分页)")
     //@DataPermission(permissionStr = PerPrefix.SECURITY_CHECK_PLAN)
     //@DataPermission(roleKey="checkGentle", tableAlias="*")
+    @DataPermission
     @PostMapping(value = "/appList")
     public ResultData appList(@RequestBody QueryCheckPlanListParam queryCheckPlanListParam) {
         queryCheckPlanListParam.setMyRelated(1);

+ 1 - 1
zd-modules/zd-security/src/main/java/com/zd/security/service/impl/CheckManageServiceImpl.java

@@ -446,7 +446,7 @@ public class CheckManageServiceImpl extends ServiceImpl<CheckManageMapper, Check
     }
 
     @Override
-    @DataPermission(roleKey="checkGentle", tableAlias="*")
+    @DataPermission(roleKey="checkGentle")
     public Page<CheckManage> getlist(QueryCheckManageListParam queryCheckManageListParam, LambdaQueryWrapper<CheckManage> queryWrapper) {
         return checkManageService.page(new Page<CheckManage>(queryCheckManageListParam.getPageNum(), queryCheckManageListParam.getPageSize()), queryWrapper);
     }