diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubConstructionUserController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubConstructionUserController.java index e7ee7457..063db64e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubConstructionUserController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubConstructionUserController.java @@ -123,7 +123,7 @@ public class SubConstructionUserController extends BaseController { /** * 查询每个施工人员总的考勤列表 */ - @SaCheckPermission(value = {"contractor:constructionUser:listAttendanceTotal", "project:attendance:listAttendanceTotal"}) + @SaCheckPermission(value = {"contractor:constructionUser:listAttendanceTotal", "project:attendance:listAttendanceTotal"}, mode = SaMode.OR) @GetMapping("/list/attendance/total") public TableDataInfo listAttendanceTotal(SubConstructionUserAttendanceQueryReq req, PageQuery pageQuery) { @@ -269,9 +269,9 @@ public class SubConstructionUserController extends BaseController { } /** - * 查询项目班组列表 + * 查询项目班组列表 contractor:constructionUser:newUserList */ - @SaCheckPermission("project:projectTeam:addTeam") + @SaCheckPermission(value = {"project:projectTeam:addTeam", "contractor:constructionUser:newUserList"}, mode = SaMode.OR) @GetMapping("/projectList") public TableDataInfo list(BusProjectQueryReq req, PageQuery pageQuery) { return projectService.queryPageList(req, pageQuery); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/patch/controller/PdMasterController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/patch/controller/PdMasterController.java index b468f016..cc83421d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/patch/controller/PdMasterController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/patch/controller/PdMasterController.java @@ -85,7 +85,7 @@ public class PdMasterController extends BaseController { * @param masterId 派单主表ID * @return 进度详情列表 */ - @SaCheckPermission("patch:master:getProgressList") +// @SaCheckPermission("patch:master:getProgressList") @GetMapping("/getProgressList/{masterId}") public R> getProgressList( @NotNull(message = "主表ID不能为空")