lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
zt
2025-11-27 11:44:03 +08:00
parent af90b0f879
commit 80b5f94cd4
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubConstructionUserController.java
View File

@ -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") @GetMapping("/list/attendance/total")
public TableDataInfo<SubConstructionUserAttendanceTotalVo> listAttendanceTotal(SubConstructionUserAttendanceQueryReq req, public TableDataInfo<SubConstructionUserAttendanceTotalVo> listAttendanceTotal(SubConstructionUserAttendanceQueryReq req,
PageQuery pageQuery) { 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") @GetMapping("/projectList")
public TableDataInfo<BusProjectVo> list(BusProjectQueryReq req, PageQuery pageQuery) { public TableDataInfo<BusProjectVo> list(BusProjectQueryReq req, PageQuery pageQuery) {
return projectService.queryPageList(req, pageQuery); return projectService.queryPageList(req, pageQuery);

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/patch/controller/PdMasterController.java
View File

@ -85,7 +85,7 @@ public class PdMasterController extends BaseController {
* @param masterId 派单主表ID * @param masterId 派单主表ID
* @return 进度详情列表 * @return 进度详情列表
*/ */
@SaCheckPermission("patch:master:getProgressList") // @SaCheckPermission("patch:master:getProgressList")
@GetMapping("/getProgressList/{masterId}") @GetMapping("/getProgressList/{masterId}")
public R<List<PdMasterProgressVo>> getProgressList( public R<List<PdMasterProgressVo>> getProgressList(
@NotNull(message = "主表ID不能为空") @NotNull(message = "主表ID不能为空")