Преглед изворни кода

添加鉴权注解@SaCheckPermission

大数据与最优化研究所 пре 3 месеци
родитељ
комит
ec77310629
100 измењених фајлова са 544 додато и 324 уклоњено
  1. 1 4
      src/main/java/com/xjrsoft/config/SaTokenConfig.java
  2. 2 0
      src/main/java/com/xjrsoft/module/ledger/controller/LedgeViewController.java
  3. 3 4
      src/main/java/com/xjrsoft/module/ledger/controller/LedgerConfigController.java
  4. 3 5
      src/main/java/com/xjrsoft/module/ledger/controller/LedgerConfigReleaseController.java
  5. 2 2
      src/main/java/com/xjrsoft/module/ledger/controller/LedgerCustomController.java
  6. 2 0
      src/main/java/com/xjrsoft/module/ledger/controller/LedgerExportController.java
  7. 6 6
      src/main/java/com/xjrsoft/module/ledger/controller/LedgerStatisticsController.java
  8. 3 4
      src/main/java/com/xjrsoft/module/ledger/controller/WfSubscriptionController.java
  9. 4 5
      src/main/java/com/xjrsoft/module/liteflow/controller/XjrLiteflowChainController.java
  10. 3 0
      src/main/java/com/xjrsoft/module/magicapi/controller/InterfaceAuthController.java
  11. 5 0
      src/main/java/com/xjrsoft/module/magicapi/controller/MagicApiController.java
  12. 16 10
      src/main/java/com/xjrsoft/module/material/controller/MaterialTaskController.java
  13. 9 6
      src/main/java/com/xjrsoft/module/material/controller/MaterialTypeController.java
  14. 4 4
      src/main/java/com/xjrsoft/module/oa/controller/FileReceiveController.java
  15. 6 0
      src/main/java/com/xjrsoft/module/oa/controller/MessageController.java
  16. 20 0
      src/main/java/com/xjrsoft/module/oa/controller/NewsController.java
  17. 3 3
      src/main/java/com/xjrsoft/module/oa/controller/OfficialDocumentPostController.java
  18. 5 5
      src/main/java/com/xjrsoft/module/oa/controller/OfficialDocumentReceivedController.java
  19. 5 5
      src/main/java/com/xjrsoft/module/oa/controller/OfficialDocumentReceivedHandleController.java
  20. 19 0
      src/main/java/com/xjrsoft/module/oa/controller/ProclamationController.java
  21. 6 0
      src/main/java/com/xjrsoft/module/oa/controller/ScheduleController.java
  22. 15 15
      src/main/java/com/xjrsoft/module/oa/controller/WfMeetingApplyController.java
  23. 11 0
      src/main/java/com/xjrsoft/module/organization/controller/DepartmentController.java
  24. 4 0
      src/main/java/com/xjrsoft/module/organization/controller/DingtalkController.java
  25. 12 0
      src/main/java/com/xjrsoft/module/organization/controller/PostController.java
  26. 13 0
      src/main/java/com/xjrsoft/module/organization/controller/RoleController.java
  27. 37 2
      src/main/java/com/xjrsoft/module/organization/controller/UserController.java
  28. 5 0
      src/main/java/com/xjrsoft/module/organization/controller/WechatController.java
  29. 5 2
      src/main/java/com/xjrsoft/module/oss/controller/OssController.java
  30. 2 3
      src/main/java/com/xjrsoft/module/outint/controller/CarOutInRecordController.java
  31. 2 2
      src/main/java/com/xjrsoft/module/outint/controller/StudentOutInRecordController.java
  32. 3 3
      src/main/java/com/xjrsoft/module/outint/controller/TeacherOutInRecordController.java
  33. 2 2
      src/main/java/com/xjrsoft/module/outint/controller/VisitorOutInRecordController.java
  34. 5 7
      src/main/java/com/xjrsoft/module/personnel/controller/BasePersonnelLabourCapitalController.java
  35. 6 6
      src/main/java/com/xjrsoft/module/personnel/controller/CarManagementController.java
  36. 5 5
      src/main/java/com/xjrsoft/module/personnel/controller/CarMessageApplyController.java
  37. 1 1
      src/main/java/com/xjrsoft/module/personnel/controller/CarParkRecordsController.java
  38. 2 1
      src/main/java/com/xjrsoft/module/personnel/controller/FaceIdentifyRecordsController.java
  39. 10 12
      src/main/java/com/xjrsoft/module/personnel/controller/FaceManagementController.java
  40. 2 1
      src/main/java/com/xjrsoft/module/personnel/controller/LaborManagementController.java
  41. 2 2
      src/main/java/com/xjrsoft/module/personnel/controller/PersonnelHealthyController.java
  42. 5 5
      src/main/java/com/xjrsoft/module/personnel/controller/ReservationSchoolController.java
  43. 5 5
      src/main/java/com/xjrsoft/module/personnel/controller/StundentFaceProcessController.java
  44. 3 3
      src/main/java/com/xjrsoft/module/personnel/controller/TeacherFaceProcessController.java
  45. 3 0
      src/main/java/com/xjrsoft/module/print/controller/PrintConfigController.java
  46. 8 0
      src/main/java/com/xjrsoft/module/print/controller/PrintSchemaController.java
  47. 3 0
      src/main/java/com/xjrsoft/module/prodOrder/controller/OrderController.java
  48. 6 0
      src/main/java/com/xjrsoft/module/report/controller/ProfessionalReportController.java
  49. 4 0
      src/main/java/com/xjrsoft/module/report/controller/ReportController.java
  50. 6 0
      src/main/java/com/xjrsoft/module/report/controller/ReportReleaseController.java
  51. 1 1
      src/main/java/com/xjrsoft/module/room/controller/DistributeRoomBedController.java
  52. 7 7
      src/main/java/com/xjrsoft/module/room/controller/RoomBedAdjustController.java
  53. 5 4
      src/main/java/com/xjrsoft/module/room/controller/RoomBedCheckRecordController.java
  54. 6 4
      src/main/java/com/xjrsoft/module/room/controller/RoomBedController.java
  55. 4 2
      src/main/java/com/xjrsoft/module/room/controller/RoomController.java
  56. 3 3
      src/main/java/com/xjrsoft/module/room/controller/RoomRuleController.java
  57. 4 4
      src/main/java/com/xjrsoft/module/room/controller/RoomStudentAppointController.java
  58. 2 2
      src/main/java/com/xjrsoft/module/room/controller/RoomTeacherAppointController.java
  59. 3 2
      src/main/java/com/xjrsoft/module/room/controller/RoomValueWeekController.java
  60. 3 2
      src/main/java/com/xjrsoft/module/room/controller/WfRoomApplicantController.java
  61. 3 2
      src/main/java/com/xjrsoft/module/room/controller/WfRoomReportController.java
  62. 3 2
      src/main/java/com/xjrsoft/module/room/controller/WfRoomStayOvernightController.java
  63. 15 14
      src/main/java/com/xjrsoft/module/schedule/controller/ScheduleController.java
  64. 1 1
      src/main/java/com/xjrsoft/module/schedule/controller/TodayScheduleController.java
  65. 2 2
      src/main/java/com/xjrsoft/module/student/controller/BaseClassMajorSetController.java
  66. 4 2
      src/main/java/com/xjrsoft/module/student/controller/BaseMajorCategorController.java
  67. 25 7
      src/main/java/com/xjrsoft/module/student/controller/BaseNewStudentController.java
  68. 5 5
      src/main/java/com/xjrsoft/module/student/controller/BaseNewStudentReportController.java
  69. 2 2
      src/main/java/com/xjrsoft/module/student/controller/BaseStudentAssessmentCategoryController.java
  70. 8 8
      src/main/java/com/xjrsoft/module/student/controller/BaseStudentAssessmentInspectionController.java
  71. 2 2
      src/main/java/com/xjrsoft/module/student/controller/BaseStudentAssessmentItemController.java
  72. 4 4
      src/main/java/com/xjrsoft/module/student/controller/BaseStudentAssessmentProjectController.java
  73. 3 3
      src/main/java/com/xjrsoft/module/student/controller/BaseStudentBehaviorCategoryController.java
  74. 4 4
      src/main/java/com/xjrsoft/module/student/controller/BaseStudentBehaviorManageController.java
  75. 3 3
      src/main/java/com/xjrsoft/module/student/controller/BaseStudentBehaviorProjectController.java
  76. 2 2
      src/main/java/com/xjrsoft/module/student/controller/BaseStudentBursariesApplicantController.java
  77. 2 2
      src/main/java/com/xjrsoft/module/student/controller/BaseStudentBursariesProjectController.java
  78. 2 2
      src/main/java/com/xjrsoft/module/student/controller/BaseStudentBursariesStudentController.java
  79. 8 7
      src/main/java/com/xjrsoft/module/student/controller/BaseStudentCadreController.java
  80. 2 2
      src/main/java/com/xjrsoft/module/student/controller/BaseStudentDevelopmentController.java
  81. 4 2
      src/main/java/com/xjrsoft/module/student/controller/BaseStudentGraduateController.java
  82. 8 8
      src/main/java/com/xjrsoft/module/student/controller/BaseStudentInfoController.java
  83. 4 3
      src/main/java/com/xjrsoft/module/student/controller/BaseStudentPostController.java
  84. 5 5
      src/main/java/com/xjrsoft/module/student/controller/BaseStudentPunishmentInfoController.java
  85. 4 4
      src/main/java/com/xjrsoft/module/student/controller/BaseStudentScholarshipApplicantController.java
  86. 3 3
      src/main/java/com/xjrsoft/module/student/controller/BaseStudentScholarshipCategoryController.java
  87. 5 4
      src/main/java/com/xjrsoft/module/student/controller/BaseStudentScholarshipReleaseController.java
  88. 4 4
      src/main/java/com/xjrsoft/module/student/controller/CadreDeptController.java
  89. 4 3
      src/main/java/com/xjrsoft/module/student/controller/ClassHonorsController.java
  90. 12 11
      src/main/java/com/xjrsoft/module/student/controller/ConsumptionController.java
  91. 4 4
      src/main/java/com/xjrsoft/module/student/controller/EnrollmentPlanController.java
  92. 2 2
      src/main/java/com/xjrsoft/module/student/controller/EnrollmentPlanGraduateSchoolController.java
  93. 4 4
      src/main/java/com/xjrsoft/module/student/controller/EnrollmentPlanMajorSetController.java
  94. 5 2
      src/main/java/com/xjrsoft/module/student/controller/LeagueMembersManageController.java
  95. 5 3
      src/main/java/com/xjrsoft/module/student/controller/PbCseFeeitem2Controller.java
  96. 9 5
      src/main/java/com/xjrsoft/module/student/controller/PbCseFeeobjupdateController.java
  97. 3 3
      src/main/java/com/xjrsoft/module/student/controller/PbCseSpecplanController.java
  98. 3 3
      src/main/java/com/xjrsoft/module/student/controller/PbSemesterConfigController.java
  99. 2 2
      src/main/java/com/xjrsoft/module/student/controller/QuotaFormulaRuleAttributeController.java
  100. 2 2
      src/main/java/com/xjrsoft/module/student/controller/QuotaFormulaRuleConstantController.java

+ 1 - 4
src/main/java/com/xjrsoft/config/SaTokenConfig.java

@@ -24,10 +24,6 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
 /**
  * @Author: tzx
  * @Date: 2022/3/3 17:18
@@ -48,6 +44,7 @@ public class SaTokenConfig implements WebMvcConfigurer {
     public void addInterceptors(InterceptorRegistry registry) {
         // 注册MagicApi登录判断拦截器
         registry.addInterceptor(new MagicApiWebLoginInterceptor()).addPathPatterns(magicApiConfig.getWeb() + "/**");
+
         // 注册拦截器
         registry.addInterceptor(getRateLimitInterceptor()).addPathPatterns("/**");
 

+ 2 - 0
src/main/java/com/xjrsoft/module/ledger/controller/LedgeViewController.java

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.ledger.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.xjrsoft.common.annotation.XjrLog;
 import com.xjrsoft.common.model.result.RT;
@@ -36,6 +37,7 @@ public class LedgeViewController {
 
     @GetMapping("/getWorkflowInfo")
     @ApiOperation(value = "获取流程信息")
+    @SaCheckPermission("ledgeview:getworkflowinfo")
     @XjrLog(value = "获取流程信息", saveResponseData = true)
     public RT<GetWorkflowInfoVo> getWorkflowInfo(@RequestParam Long id) {
         GetWorkflowInfoVo info = new GetWorkflowInfoVo();

+ 3 - 4
src/main/java/com/xjrsoft/module/ledger/controller/LedgerConfigController.java

@@ -42,7 +42,7 @@ public class LedgerConfigController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "台账配置表列表(分页)")
-    @SaCheckPermission("ledgerconfig:detail")
+    @SaCheckPermission("ledgerconfig:page")
     @XjrLog(value = "台账配置表列表(分页)")
     public RT<PageOutput<LedgerConfigPageVo>> page(@Valid LedgerConfigPageDto dto) {
         LambdaQueryWrapper<LedgerConfig> queryWrapper = new LambdaQueryWrapper<>();
@@ -57,7 +57,7 @@ public class LedgerConfigController {
 
     @GetMapping(value = "/getPorcessId")
     @ApiOperation(value = "获取processId")
-    @SaCheckPermission("ledgerconfig:detail")
+    @SaCheckPermission("ledgerconfig:getporcessid")
     @XjrLog(value = "获取processId", saveResponseData = true)
     public RT<String> getPorcessId(@RequestParam Long dto) {
         return RT.ok("pageOutput");
@@ -80,7 +80,7 @@ public class LedgerConfigController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询台账配置表信息")
-    @SaCheckPermission("ledgerconfig:detail")
+    @SaCheckPermission("ledgerconfig:info")
     @XjrLog(value = "根据id查询台账配置表信息", saveResponseData = true)
     public RT<LedgerConfigVo> info(@RequestParam Long id) {
         LedgerConfig ledgerConfig = ledgerConfigService.getById(id);
@@ -90,7 +90,6 @@ public class LedgerConfigController {
         return RT.ok(BeanUtil.toBean(ledgerConfig, LedgerConfigVo.class));
     }
 
-
     @PostMapping
     @ApiOperation(value = "新增台账配置表")
     @SaCheckPermission("ledgerconfig:add")

+ 3 - 5
src/main/java/com/xjrsoft/module/ledger/controller/LedgerConfigReleaseController.java

@@ -34,12 +34,11 @@ import java.util.List;
 @AllArgsConstructor
 public class LedgerConfigReleaseController {
 
-
     private final ILedgerConfigReleaseService ledgerConfigReleaseService;
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "台账发布表列表(分页)")
-    @SaCheckPermission("ledgerconfigrelease:detail")
+    @SaCheckPermission("ledgerconfigrelease:page")
     @XjrLog(value = "台账发布表列表(分页)")
     public RT<PageOutput<LedgerConfigReleasePageVo>> page(@Valid LedgerConfigReleasePageDto dto) {
         Page<LedgerConfigPageVo> page = ledgerConfigReleaseService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
@@ -49,7 +48,7 @@ public class LedgerConfigReleaseController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询台账发布表信息")
-    @SaCheckPermission("ledgerconfigrelease:detail")
+    @SaCheckPermission("ledgerconfigrelease:info")
     @XjrLog(value = "根据id查询台账发布表信息", saveResponseData = true)
     public RT<LedgerConfigReleaseVo> info(@RequestParam Long id) {
         LedgerConfigReleaseVo release = ledgerConfigReleaseService.getRelease(id);
@@ -61,7 +60,7 @@ public class LedgerConfigReleaseController {
 
     @GetMapping(value = "/config-into")
     @ApiOperation(value = "根据id查询台账菜单配置信息")
-    @SaCheckPermission("ledgerconfigrelease:detail")
+    @SaCheckPermission("ledgerconfigrelease:configinto")
     @XjrLog(value = "根据id查询台账菜单配置信息", saveResponseData = true)
     public RT<LedgerConfigReleaseInfoVo> configInto(@RequestParam Long id) {
         LedgerConfigReleaseInfoVo release = ledgerConfigReleaseService.getConfigInfo(id);
@@ -71,7 +70,6 @@ public class LedgerConfigReleaseController {
         return RT.ok(release);
     }
 
-
     @PostMapping
     @ApiOperation(value = "新增台账发布表")
     @SaCheckPermission("ledgerconfigrelease:add")

+ 2 - 2
src/main/java/com/xjrsoft/module/ledger/controller/LedgerCustomController.java

@@ -33,7 +33,7 @@ public class LedgerCustomController {
 
     @PutMapping
     @ApiOperation(value = "修改状态(仅限于表中有enabled_mark)")
-    @SaCheckPermission("ledgerconfigrelease:edit")
+    @SaCheckPermission("ledgercustom:edit")
     @XjrLog(value = "修改状态(仅限于表中有enabled_mark)", saveResponseData = true)
     public RT<Boolean> update(@Valid @RequestBody LedgerCustomUpdateDto dto) {
         Entity params = Entity.create(dto.getTableName());
@@ -55,7 +55,7 @@ public class LedgerCustomController {
 
     @DeleteMapping
     @ApiOperation(value = "删除数据(仅限于表中有delete_mark)")
-    @SaCheckPermission("ledgerconfigrelease:delete")
+    @SaCheckPermission("ledgercustom:delete")
     @XjrLog(value = "删除数据(仅限于表中有delete_mark)", saveResponseData = true)
     public RT<Boolean> delete(@Valid @RequestBody LedgerCustomDeleteDto dto) {
         Entity where = Entity.create(dto.getTableName());

+ 2 - 0
src/main/java/com/xjrsoft/module/ledger/controller/LedgerExportController.java

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.ledger.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.db.Entity;
 import com.alibaba.excel.EasyExcel;
@@ -66,6 +67,7 @@ public class LedgerExportController {
 
     @PostMapping("/export-query")
     @ApiOperation(value = "导出")
+    @SaCheckPermission("ledgerexport:exportquery")
     @XjrLog(value = "导出")
     public ResponseEntity<byte[]> exportData(@Valid @RequestBody LedgerExportDataDto dto) {
 //    @GetMapping("/export-query")

+ 6 - 6
src/main/java/com/xjrsoft/module/ledger/controller/LedgerStatisticsController.java

@@ -58,7 +58,7 @@ public class LedgerStatisticsController {
 
     @GetMapping(value = "/teacher-leave-page")
     @ApiOperation(value = "教师请假统计(分页)")
-    @SaCheckPermission("ledgerstatistics:detail")
+    @SaCheckPermission("ledgerstatistics:teacherleavepage")
     @XjrLog(value = "教师请假统计(分页)")
     public RT<PageOutput<LedgerStatisticsLeaveVo>> teacherLeavePage(@Valid LedgerStatisticsPageDto dto) {
         List<Long> userIdList = new ArrayList<>();
@@ -89,7 +89,7 @@ public class LedgerStatisticsController {
 
     @PostMapping(value = "/teacher-leave-export-query")
     @ApiOperation(value = "教师请假统计-导出")
-    @SaCheckPermission("ledgerstatistics:detail")
+    @SaCheckPermission("ledgerstatistics:teacherleaveexportquery")
     @XjrLog(value = "教师请假统计-导出")
     public ResponseEntity<byte[]> teacherLeaveExportQuery(@Valid @RequestBody LedgerStatisticsPageDto dto) {
         List<Long> userIdList = new ArrayList<>();
@@ -132,7 +132,7 @@ public class LedgerStatisticsController {
 
     @GetMapping(value = "/teacher-overtime-page")
     @ApiOperation(value = "教师加班统计(分页)")
-    @SaCheckPermission("ledgerstatistics:detail")
+    @SaCheckPermission("ledgerstatistics:teacherovertimepage")
     @XjrLog(value = "教师加班统计(分页)")
     public RT<PageOutput<LedgerStatisticsOvertimeVo>> teacherOvertimePage(@Valid LedgerStatisticsPageDto dto) {
 
@@ -214,7 +214,7 @@ public class LedgerStatisticsController {
 
     @PostMapping(value = "/teacher-overtime-export-query")
     @ApiOperation(value = "教师加班统计-导出")
-    @SaCheckPermission("ledgerstatistics:detail")
+    @SaCheckPermission("ledgerstatistics:teacherovertimeexportquery")
     @XjrLog(value = "教师加班统计-导出")
     public ResponseEntity<byte[]> teacherOvertimeExportQuery(@Valid @RequestBody LedgerStatisticsPageDto dto) {
         List<Long> userIdList = new ArrayList<>();
@@ -306,7 +306,7 @@ public class LedgerStatisticsController {
 
     @GetMapping(value = "/teacher-listen-page")
     @ApiOperation(value = "教师听课统计(分页)")
-    @SaCheckPermission("ledgerstatistics:detail")
+    @SaCheckPermission("ledgerstatistics:teacherlistenpage")
     @XjrLog(value = "教师听课统计(分页)")
     public RT<PageOutput<LedgerStatisticsListenVo>> teacherListenPage(@Valid LedgerStatisticsPageDto dto) {
         List<Long> userIdList = new ArrayList<>();
@@ -377,7 +377,7 @@ public class LedgerStatisticsController {
 
     @PostMapping(value = "/teacher-listen-export-query")
     @ApiOperation(value = "教师听课统计-导出")
-    @SaCheckPermission("ledgerstatistics:detail")
+    @SaCheckPermission("ledgerstatistics:teacherlistenexportquery")
     @XjrLog(value = "教师听课统计-导出")
     public ResponseEntity<byte[]> teacherListenExportQuery(@Valid @RequestBody LedgerStatisticsPageDto dto) {
         List<Long> userIdList = new ArrayList<>();

+ 3 - 4
src/main/java/com/xjrsoft/module/ledger/controller/WfSubscriptionController.java

@@ -44,7 +44,7 @@ public class WfSubscriptionController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "物品申购台账列表(分页)")
-    @SaCheckPermission("wfsubscription:detail")
+    @SaCheckPermission("wfsubscription:page")
     @XjrLog(value = "物品申购台账列表(分页)")
     public RT<PageOutput<WfSubscriptionPageVo>> page(@Valid WfSubscriptionPageDto dto) {
         IPage<WfSubscriptionPageVo> page = wfSubscriptionService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
@@ -54,7 +54,7 @@ public class WfSubscriptionController {
 
     @GetMapping(value = "/subscription-list")
     @ApiOperation(value = "查看物品清单")
-    @SaCheckPermission("wfsubscription:detail")
+    @SaCheckPermission("wfsubscription:subscriptionlist")
     @XjrLog(value = "查看物品清单", saveResponseData = true)
     public RT<WfSubscriptionListInfoVo> subscriptionPage(@RequestParam Long id) {
         WfSubscriptionListInfoVo wfSubscription = wfSubscriptionService.getSubscriptionList(id);
@@ -64,7 +64,6 @@ public class WfSubscriptionController {
         return RT.ok(wfSubscription);
     }
 
-
     @PostMapping
     @ApiOperation(value = "新增物品申购")
     @SaCheckPermission("wfsubscription:add")
@@ -75,9 +74,9 @@ public class WfSubscriptionController {
         return RT.ok(isSuccess);
     }
 
-
     @PostMapping("/export-query")
     @ApiOperation(value = "导出")
+    @SaCheckPermission("wfsubscription:exportquery")
     @XjrLog(value = "导出")
     public ResponseEntity<byte[]> exportData(@Valid @RequestBody WfSubscriptionPageDto dto) {
         List<WfSubscriptionExcelVo> customerList = wfSubscriptionService.getList(dto);

+ 4 - 5
src/main/java/com/xjrsoft/module/liteflow/controller/XjrLiteflowChainController.java

@@ -45,7 +45,7 @@ public class XjrLiteflowChainController {
 
     @GetMapping(value = "/list")
     @ApiOperation(value = "规则表列表(不分页)")
-    @SaCheckPermission("xjrliteflowchain:detail")
+    @SaCheckPermission("xjrliteflowchain:list")
     @XjrLog(value = "规则表列表(不分页)")
     public RT<List<XjrLiteflowChainListVo>> list(@Valid XjrLiteflowChainListDto dto) {
 
@@ -61,7 +61,7 @@ public class XjrLiteflowChainController {
 
     @GetMapping(value = "/options")
     @ApiOperation(value = "规则下拉选项")
-    @SaCheckPermission("xjrliteflowchain:detail")
+    @SaCheckPermission("xjrliteflowchain:options")
     @XjrLog(value = "规则下拉选项")
     public RT<List<XjrLiteflowChainOptionsVo>> options() {
 
@@ -77,7 +77,7 @@ public class XjrLiteflowChainController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "规则表列表(分页)")
-    @SaCheckPermission("xjrliteflowchain:detail")
+    @SaCheckPermission("xjrliteflowchain:page")
     @XjrLog(value = "规则表列表(分页)")
     public RT<PageOutput<XjrLiteflowChainPageVo>> page(@Valid XjrLiteflowChainPageDto dto) {
 
@@ -92,7 +92,7 @@ public class XjrLiteflowChainController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询规则表信息")
-    @SaCheckPermission("xjrliteflowchain:detail")
+    @SaCheckPermission("xjrliteflowchain:info")
     @XjrLog(value = "根据id查询规则表信息", saveResponseData = true)
     public RT<XjrLiteflowChainVo> info(@RequestParam Long id) {
         XjrLiteflowChain xjrLiteflowChain = xjrLiteflowChainService.getById(id);
@@ -102,7 +102,6 @@ public class XjrLiteflowChainController {
         return RT.ok(BeanUtil.toBean(xjrLiteflowChain, XjrLiteflowChainVo.class));
     }
 
-
     @PostMapping
     @ApiOperation(value = "新增规则表")
     @SaCheckPermission("xjrliteflowchain:add")

+ 3 - 0
src/main/java/com/xjrsoft/module/magicapi/controller/InterfaceAuthController.java

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.magicapi.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.xjrsoft.common.annotation.XjrLog;
@@ -35,6 +36,7 @@ public class InterfaceAuthController {
 
     @GetMapping(value = "/role")
     @ApiOperation("查询角色所授权的接口id集合")
+    @SaCheckPermission("interfaceauth:role")
     @XjrLog(value = "查询角色所授权的接口id集合")
     public R role(@RequestParam Long roleId) {
         List<InterfaceAuth> authList = authService.list(Wrappers.<InterfaceAuth>query().lambda()
@@ -48,6 +50,7 @@ public class InterfaceAuthController {
 
     @PostMapping
     @ApiOperation("角色接口授权")
+    @SaCheckPermission("interfaceauth:authorize")
     @XjrLog(value = "角色接口授权", saveResponseData = true)
     public R authorize(@RequestBody InterfaceAuthDto dto) {
         // 删除原有的接口权限

+ 5 - 0
src/main/java/com/xjrsoft/module/magicapi/controller/MagicApiController.java

@@ -1,6 +1,7 @@
 package com.xjrsoft.module.magicapi.controller;
 
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.xjrsoft.common.annotation.XjrLog;
 import com.xjrsoft.common.constant.GlobalConstant;
 import com.xjrsoft.common.model.result.R;
@@ -34,6 +35,7 @@ public class MagicApiController {
 
     @GetMapping(value = "/tree")
     @ApiOperation("查询所有分组以及api 树结构")
+    @SaCheckPermission("magicapi:tree")
     @XjrLog(value = "查询所有分组以及api 树结构")
     public R tree(@RequestParam(required = false) String keyword) {
         List<MagicApiTreeVo> tree = magicApiService.tree(keyword);
@@ -42,6 +44,7 @@ public class MagicApiController {
 
     @GetMapping(value = "/group/tree")
     @ApiOperation("查询所有树结构分组")
+    @SaCheckPermission("magicapi:grouptree")
     @XjrLog(value = "查询所有树结构分组")
     public R groupTree() {
         return R.ok(magicApiService.groupTree());
@@ -49,6 +52,7 @@ public class MagicApiController {
 
     @GetMapping(value = "/info")
     @ApiOperation("查询api详情")
+    @SaCheckPermission("magicapi:info")
     @XjrLog(value = "查询api详情")
     public R info(@RequestParam String id) {
         return R.ok(magicApiService.info(id));
@@ -56,6 +60,7 @@ public class MagicApiController {
 
     @GetMapping(value = "/list")
     @ApiOperation("根据分组id 查询所有api")
+    @SaCheckPermission("magicapi:list")
     @XjrLog(value = "根据分组id 查询所有api")
     public R list(@RequestParam String groupId) {
         return R.ok(magicApiService.list(groupId));

+ 16 - 10
src/main/java/com/xjrsoft/module/material/controller/MaterialTaskController.java

@@ -84,7 +84,7 @@ public class MaterialTaskController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "材料提交任务列表(分页 我发布的)")
-    @SaCheckPermission("materialtask:detail")
+    @SaCheckPermission("materialtask:page")
     @XjrLog(value = "材料提交任务列表(分页 我发布的)")
     public RT<PageOutput<MaterialTaskPageVo>> page(@Valid MaterialTaskPageDto dto) {
         List<Long> roleIds = StpUtil.getTokenSession().get(GlobalConstant.LOGIN_USER_ROLE_ID_KEY, new ArrayList<>());
@@ -110,7 +110,7 @@ public class MaterialTaskController {
 
     @GetMapping(value = "/wait-page")
     @ApiOperation(value = "材料提交任务列表(分页 我的待办)")
-    @SaCheckPermission("materialtask:detail")
+    @SaCheckPermission("materialtask:waitpage")
     @XjrLog(value = "材料提交任务列表(分页 我的待办")
     public RT<PageOutput<MaterialTaskWaitPageVo>> waitPage(@Valid MaterialTaskWaitPageDto dto) {
 
@@ -153,7 +153,7 @@ public class MaterialTaskController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询材料提交任务信息")
-    @SaCheckPermission("materialtask:detail")
+    @SaCheckPermission("materialtask:info")
     @XjrLog(value = "根据id查询材料提交任务信息", saveResponseData = true)
     public RT<MaterialTaskVo> info(@RequestParam Long id) {
         MaterialTaskVo materialTaskVo = materialTaskService.getInfoById(id);
@@ -162,14 +162,13 @@ public class MaterialTaskController {
 
     @GetMapping(value = "/view")
     @ApiOperation(value = "根据id查询材料提交任务信息")
-    @SaCheckPermission("materialtask:detail")
+    @SaCheckPermission("materialtask:view")
     @XjrLog(value = "根据id查询材料提交任务信息", saveResponseData = true)
     public RT<MaterialTaskVo> view(@RequestParam Long id) {
         MaterialTaskVo materialTaskVo = materialTaskService.getInfoViewById(id);
         return RT.ok(materialTaskVo);
     }
 
-
     @PostMapping
     @ApiOperation(value = "新增材料提交任务")
     @SaCheckPermission("materialtask:add")
@@ -206,6 +205,7 @@ public class MaterialTaskController {
 
     @PostMapping("/import")
     @ApiOperation(value = "导入")
+    @SaCheckPermission("materialtask:import")
     @XjrLog(value = "导入", saveRequestData = false, saveResponseData = true)
     public RT<Boolean> importData(@RequestParam MultipartFile file) throws IOException {
         List<MaterialTaskPageVo> savedDataList = EasyExcel.read(file.getInputStream()).head(MaterialTaskPageVo.class).sheet().doReadSync();
@@ -215,6 +215,7 @@ public class MaterialTaskController {
 
     @PostMapping("/export-query")
     @ApiOperation(value = "导出")
+    @SaCheckPermission("materialtask:exportquery")
     @XjrLog(value = "导出")
     public ResponseEntity<byte[]> exportData(@Valid @RequestBody MaterialTaskAssignListDto dto) {
         List<MaterialTaskAssignListVo> customerList = materialTaskService.assignList(dto);
@@ -257,7 +258,7 @@ public class MaterialTaskController {
 
     @GetMapping(value = "/assign-page")
     @ApiOperation(value = "材料提交任务分员列表(分页)")
-    @SaCheckPermission("materialtask:detail")
+    @SaCheckPermission("materialtask:assignpage")
     @XjrLog(value = "材料提交任务分员列表(分页)")
     public RT<PageOutput<MaterialTaskAssignVo>> assignPage(@Valid MaterialTaskAssignPageDto dto) {
 
@@ -278,7 +279,7 @@ public class MaterialTaskController {
 
     @PostMapping(value = "/assign-add")
     @ApiOperation(value = "材料提交任务分员权限")
-    @SaCheckPermission("materialtask:add")
+    @SaCheckPermission("materialtask:assignadd")
     @XjrLog(value = "材料提交任务分员权限", saveResponseData = true)
     public RT<Boolean> assignAdd(@Valid @RequestBody AddMaterialTaskAssignDto dto) {
         boolean isSuccess = materialTaskAssignService.add(dto);
@@ -287,7 +288,7 @@ public class MaterialTaskController {
 
     @DeleteMapping(value = "/assign-delete")
     @ApiOperation(value = "删除材料提交任务分员")
-    @SaCheckPermission("materialtask:delete")
+    @SaCheckPermission("materialtask:assigndelete")
     @XjrLog(value = "删除材料提交任务分员", saveResponseData = true)
     public RT<Boolean> assignDelete(@Valid @RequestBody List<Long> ids) {
         return RT.ok(materialTaskAssignService.delete(ids));
@@ -295,7 +296,7 @@ public class MaterialTaskController {
 
     @PostMapping(value = "submited")
     @ApiOperation(value = "提交材料")
-    @SaCheckPermission("materialtask:add")
+    @SaCheckPermission("materialtask:submited")
     @XjrLog(value = "提交材料", saveResponseData = true)
     public RT<Boolean> submited(@Valid @RequestBody MaterialTaskAssignAppendixDto dto) {
         boolean isSuccess = materialTaskService.submited(dto);
@@ -304,6 +305,7 @@ public class MaterialTaskController {
 
     @PostMapping("/approved")
     @ApiOperation(value = "提交材料审核")
+    @SaCheckPermission("materialtask:approved")
     @XjrLog(value = "提交材料审核", saveResponseData = true)
     public R approved(@Valid @RequestBody List<MaterialTaskAssignApprovedDto> dtos) {
         return R.ok(materialTaskAssignService.approved(dtos));
@@ -311,6 +313,7 @@ public class MaterialTaskController {
 
     @PutMapping("/end")
     @ApiOperation(value = "提交材料结束 enabledMark 不用传")
+    @SaCheckPermission("materialtask:end")
     @XjrLog(value = "提交材料结束 enabledMark 不用传", saveResponseData = true)
     public R end(@Valid @RequestBody UpdateEnableMarkDto dto) {
         MaterialTask materialTask = new MaterialTask();
@@ -322,7 +325,7 @@ public class MaterialTaskController {
 
     @GetMapping(value = "/assign-list")
     @ApiOperation(value = "审核分员列表")
-    @SaCheckPermission("materialtask:detail")
+    @SaCheckPermission("materialtask:assignlist")
     @XjrLog(value = "审核分员列表")
     public RT<List<MaterialTaskAssignListVo>> assignList(@Valid MaterialTaskAssignListDto dto) {
         return RT.ok(materialTaskService.assignList(dto));
@@ -330,6 +333,7 @@ public class MaterialTaskController {
 
     @GetMapping("/view-contents")
     @ApiOperation(value = "查看填报的表单")
+    @SaCheckPermission("materialtask:viewcontents")
     @XjrLog(value = "查看填报的表单")
     public R viewContent(@Valid ViewContentDto dto) {
         return R.ok(formExecuteService.getInfoByTemplateId(new FormExecuteInfoDto() {{
@@ -340,6 +344,7 @@ public class MaterialTaskController {
 
     @PostMapping("/form-data-export-query")
     @ApiOperation(value = "表单缴交数据条件导出")
+    @SaCheckPermission("materialtask:formdataexportquery")
     @XjrLog(value = "表单缴交数据条件导出")
     public ResponseEntity<byte[]> formDataExportQuery(@Valid @RequestBody FormDataExportQueryDto dto) {
         ByteArrayOutputStream bot = materialTaskService.formDataExportQuery(dto);
@@ -348,6 +353,7 @@ public class MaterialTaskController {
 
     @PostMapping("/download-file-export-query")
     @ApiOperation(value = "下载附件(zip压缩包)")
+    @SaCheckPermission("materialtask:downloadfileexportquery")
     @XjrLog(value = "下载附件")
     public ResponseEntity<byte[]> downloadFile(@Valid @RequestBody MaterialTaskAssignListDto dto) {
         byte[] bytes = materialTaskService.downloadFile(dto);

+ 9 - 6
src/main/java/com/xjrsoft/module/material/controller/MaterialTypeController.java

@@ -50,14 +50,13 @@ import java.util.List;
 @AllArgsConstructor
 public class MaterialTypeController {
 
-
     private final IMaterialTypeService materialTypeService;
 
     private final IMaterialTypeAssignService materialTypeAssignService;
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "材料提交任务类型列表(分页)")
-    @SaCheckPermission("materialtype:detail")
+    @SaCheckPermission("materialtype:page")
     @XjrLog(value = "材料提交任务类型列表(分页)")
     public RT<PageOutput<MaterialTypePageVo>> page(@Valid MaterialTypePageDto dto) {
         PageOutput<MaterialTypePageVo> pageOutput = materialTypeService.getPage(dto);
@@ -66,6 +65,7 @@ public class MaterialTypeController {
 
     @GetMapping(value = "/list")
     @ApiOperation(value = "材料提交任务类型列表(权限)")
+    @SaCheckPermission("materialtype:list")
     @XjrLog(value = "材料提交任务类型列表(权限)")
     public RT<List<MaterialTypeVo>> list() {
         return RT.ok(materialTypeService.listMaterialTypeVo());
@@ -73,7 +73,7 @@ public class MaterialTypeController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询材料提交任务类型信息")
-    @SaCheckPermission("materialtype:detail")
+    @SaCheckPermission("materialtype:info")
     @XjrLog(value = "根据id查询材料提交任务类型信息", saveResponseData = true)
     public RT<MaterialTypeVo> info(@RequestParam Long id) {
         MaterialTypeVo materialTypeVo = materialTypeService.getInfoById(id);
@@ -115,6 +115,7 @@ public class MaterialTypeController {
 
     @PostMapping("/import")
     @ApiOperation(value = "导入")
+    @SaCheckPermission("materialtype:import")
     @XjrLog(value = "导入", saveRequestData = false, saveResponseData = true)
     public RT<Boolean> importData(@RequestParam MultipartFile file) throws IOException {
         List<MaterialTypePageVo> savedDataList = EasyExcel.read(file.getInputStream()).head(MaterialTypePageVo.class).sheet().doReadSync();
@@ -124,6 +125,7 @@ public class MaterialTypeController {
 
     @GetMapping("/export")
     @ApiOperation(value = "导出")
+    @SaCheckPermission("materialtype:export")
     @XjrLog(value = "导出")
     public ResponseEntity<byte[]> exportData(@Valid MaterialTypePageDto dto, @RequestParam(defaultValue = "false") Boolean isTemplate) {
         List<MaterialTypePageVo> customerList = isTemplate != null && isTemplate ? new ArrayList<>() : page(dto).getData().getList();
@@ -135,7 +137,7 @@ public class MaterialTypeController {
 
     @GetMapping(value = "/assign-page")
     @ApiOperation(value = "材料提交任务类型权限列表(分页)")
-    @SaCheckPermission("materialtype:detail")
+    @SaCheckPermission("materialtype:assignpage")
     @XjrLog(value = "材料提交任务类型权限列表(分页)")
     public RT<PageOutput<MaterialTypeAssignVo>> assignPage(@Valid MaterialTypeAssignPageDto dto) {
 
@@ -159,7 +161,7 @@ public class MaterialTypeController {
 
     @PostMapping(value = "/assign-add")
     @ApiOperation(value = "材料提交任务类型权限")
-    @SaCheckPermission("materialtype:add")
+    @SaCheckPermission("materialtype:assignadd")
     @XjrLog(value = "材料提交任务类型权限", saveResponseData = true)
     public RT<Boolean> assignAdd(@Valid @RequestBody AddMaterialTypeAssignDto dto) {
         boolean isSuccess = materialTypeAssignService.add(dto);
@@ -168,7 +170,7 @@ public class MaterialTypeController {
 
     @DeleteMapping(value = "/assign-delete")
     @ApiOperation(value = "删除材料提交任务类型")
-    @SaCheckPermission("materialtype:delete")
+    @SaCheckPermission("materialtype:assigndelete")
     @XjrLog(value = "删除材料提交任务类型", saveResponseData = true)
     public RT<Boolean> assignDelete(@Valid @RequestBody List<Long> ids) {
         return RT.ok(materialTypeAssignService.delete(ids));
@@ -176,6 +178,7 @@ public class MaterialTypeController {
 
     @PutMapping("/update-enable-mark")
     @ApiOperation(value = "修改启用状态")
+    @SaCheckPermission("materialtype:updateenablemark")
     @XjrLog(value = "修改启用状态")
     public R updateEnableMark(@Valid @RequestBody UpdateEnableMarkDto dto) {
         MaterialType materialType = new MaterialType();

+ 4 - 4
src/main/java/com/xjrsoft/module/oa/controller/FileReceiveController.java

@@ -60,7 +60,7 @@ public class FileReceiveController {
 
     @GetMapping(value = "/pull-page")
     @ApiOperation(value = "收文查询(分页)")
-    @SaCheckPermission("filereceive:detail")
+    @SaCheckPermission("filereceive:pullpage")
     @XjrLog(value = "收文查询(分页)")
     public RT<PageOutput<FileReceivePullPageVo>> pullPage(@Valid FileReceivePullPageDto dto) {
         //获取用户id
@@ -82,7 +82,7 @@ public class FileReceiveController {
 
     @GetMapping(value = "/pull-info")
     @ApiOperation(value = "根据id查询文件接收管理信息")
-    @SaCheckPermission("filereceive:detail")
+    @SaCheckPermission("filereceive:pullinfo")
     @XjrLog(value = "根据id查询文件接收管理信息", saveResponseData = true)
     public RT<FileReceivePullVo> pullInfo(@RequestParam Long id) {
         MPJLambdaWrapper<WfOaPull> queryWrapper = new MPJLambdaWrapper<>();
@@ -103,7 +103,7 @@ public class FileReceiveController {
 
     @GetMapping(value = "/push-page")
     @ApiOperation(value = "发文查询(分页)")
-    @SaCheckPermission("filereceive:detail")
+    @SaCheckPermission("filereceive:pushpage")
     @XjrLog(value = "发文查询(分页)")
     public RT<PageOutput<FileReceivePushPageVo>> pushPage(@Valid FileReceivePushPageDto dto) {
         //获取用户id
@@ -125,7 +125,7 @@ public class FileReceiveController {
 
     @GetMapping(value = "/push-info")
     @ApiOperation(value = "根据id查询文件发送管理信息")
-    @SaCheckPermission("filereceive:detail")
+    @SaCheckPermission("filereceive:pushinfo")
     @XjrLog(value = "根据id查询文件发送管理信息", saveResponseData = true)
     public RT<FileReceivePushVo> pushInfo(@RequestParam Long id) {
         MPJLambdaWrapper<WfOaPush> queryWrapper = new MPJLambdaWrapper<>();

+ 6 - 0
src/main/java/com/xjrsoft/module/oa/controller/MessageController.java

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.oa.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.LocalDateTimeUtil;
@@ -55,6 +56,7 @@ public class MessageController {
 
     @GetMapping("/list")
     @ApiOperation(value = "获取消息数据")
+    @SaCheckPermission("message:list")
     @XjrLog(value = "获取消息数据")
     public RT<List<MessageListVo>> list(MessageListDto dto) {
         Wrapper<Message> wrapper = Wrappers.<Message>query().lambda()
@@ -106,6 +108,7 @@ public class MessageController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "消息详情")
+    @SaCheckPermission("message:info")
     @XjrLog(value = "消息详情", saveResponseData = true)
     public RT<MessageVo> info(@RequestParam Long id) {
         Message msg = messageService.getById(id);
@@ -117,6 +120,7 @@ public class MessageController {
 
     @PutMapping("/read-all-message")
     @ApiOperation(value = "将所有工作流未读消息改为已读")
+    @SaCheckPermission("message:readallmessage")
     @XjrLog(value = "将所有工作流未读消息改为已读", saveResponseData = true)
     public RT<Boolean> readAllMessage() {
         //1、获取用户id
@@ -129,6 +133,7 @@ public class MessageController {
 
     @PutMapping("/read-message")
     @ApiOperation(value = "将单条未读消息改为已读")
+    @SaCheckPermission("message:readmessage")
     @XjrLog(value = "将单条未读消息改为已读", saveResponseData = true)
     public RT<Boolean> readMessage(@RequestBody ResetPasswordDto dto) {
         Message message = new Message();
@@ -140,6 +145,7 @@ public class MessageController {
 
     @PutMapping("/read-all-schedule-message")
     @ApiOperation(value = "将所有日程未读消息改为已读")
+    @SaCheckPermission("message:readallschedulemessage")
     @XjrLog(value = "将所有日程未读消息改为已读", saveResponseData = true)
     public RT<Boolean> readAllScheduleMessage() {
         //1、获取用户id

+ 20 - 0
src/main/java/com/xjrsoft/module/oa/controller/NewsController.java

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.oa.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -90,6 +91,7 @@ public class NewsController {
 
     @GetMapping
     @ApiOperation(value = "获取新闻分页")
+    @SaCheckPermission("news:page")
     @XjrLog(value = "获取新闻分页")
     public RT<PageOutput<NewsPageVo>> page(NewsPageDto dto) {
         Wrapper<News> wrapper = Wrappers.<News>query().lambda()
@@ -104,6 +106,7 @@ public class NewsController {
 
     @GetMapping("/manage-box")
     @ApiOperation(value = "获取管理新闻分页")
+    @SaCheckPermission("news:managebox")
     @XjrLog(value = "获取管理新闻分页", saveRequestData = false)
     public RT<PageOutput<NewsPageVo>> manageBox(NewsPageDto dto) {
         IPage<NewsPageVo> page = newsService.manageBox(dto);
@@ -113,6 +116,7 @@ public class NewsController {
 
     @GetMapping("/receipt-box")
     @ApiOperation(value = "获取接受新闻分页")
+    @SaCheckPermission("news:receiptbox")
     @XjrLog(value = "获取接受新闻分页")
     public RT<PageOutput<NewsPageVo>> receiptBox(NewsPageDto dto) {
         IPage<NewsPageVo> page = newsService.receiptBox(dto);
@@ -134,6 +138,7 @@ public class NewsController {
 
     @PostMapping
     @ApiOperation(value = "新增新闻")
+    @SaCheckPermission("news:add")
     @XjrLog(value = "新增新闻", saveResponseData = true)
     public RT<Boolean> add(@RequestBody AddNewsDto addNewsDto) {
         return RT.ok(newsService.add(addNewsDto));
@@ -141,6 +146,7 @@ public class NewsController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "新闻详情")
+    @SaCheckPermission("news:info")
     @XjrLog(value = "新闻详情", saveResponseData = true)
     public RT<NewsVo> info(@RequestParam Long id, @RequestParam(required = false) Boolean isRead) {
         News news = newsService.getById(id);
@@ -221,6 +227,7 @@ public class NewsController {
 
     @PutMapping
     @ApiOperation(value = "修改新闻")
+    @SaCheckPermission("news:edit")
     @XjrLog(value = "修改新闻", saveResponseData = true)
     public RT<Boolean> update(@RequestBody UpdateNewsDto updateNewsDto) {
         //News news = BeanUtil.toBean(updateNewsDto, News.class);
@@ -229,6 +236,7 @@ public class NewsController {
 
     @DeleteMapping
     @ApiOperation(value = "删除新闻")
+    @SaCheckPermission("news:delete")
     @XjrLog(value = "删除新闻", saveResponseData = true)
     public RT<Boolean> delete(@RequestBody List<Long> ids) {
         return RT.ok(newsService.delete(ids));
@@ -237,6 +245,7 @@ public class NewsController {
 
     @PutMapping("/change-status")
     @ApiOperation(value = "发布或下架新闻")
+    @SaCheckPermission("news:changestatus")
     @XjrLog(value = "发布或下架新闻", saveResponseData = true)
     public RT<Boolean> changeStatus(@RequestBody ChangeNewsDto changeNewsDto) throws Exception {
         News xjrNews = newsService.getById(changeNewsDto.getId());
@@ -265,6 +274,7 @@ public class NewsController {
 
     @PutMapping("/read")
     @ApiOperation(value = "读新闻")
+    @SaCheckPermission("news:read")
     @XjrLog(value = "读新闻", saveResponseData = true)
     public RT<Boolean> read(@RequestBody List<Long> ids) {
         for (Long id : ids) {
@@ -292,6 +302,7 @@ public class NewsController {
 
     @PutMapping("/reply")
     @ApiOperation(value = "新闻回复")
+    @SaCheckPermission("news:reply")
     @XjrLog(value = "新闻回复", saveResponseData = true)
     public RT<Boolean> reply(@RequestBody NewsReplyDto newsReplyDto) {
         NewsRelation newsRelation = newsRelationService.getOne(
@@ -318,6 +329,7 @@ public class NewsController {
 
     @GetMapping("/page-relation")
     @ApiOperation(value = "获取新闻阅读权限分页")
+    @SaCheckPermission("news:pagerelation")
     @XjrLog(value = "获取新闻阅读权限分页")
     public RT<PageOutput<NewsRelationVo>> pageRelation(NewsRelationPageDto dto) {
 
@@ -338,6 +350,7 @@ public class NewsController {
 
     @GetMapping("/page-relation-config")
     @ApiOperation(value = "获取新闻权限分页")
+    @SaCheckPermission("news:pagerelationconfig")
     @XjrLog(value = "获取新闻权限分页")
     public RT<PageOutput<NewsRelationConfigVo>> pageRelationConfig(NewsRelationPageDto dto) {
         Wrapper<NewsRelationConfig> wrapper = Wrappers.<NewsRelationConfig>query().lambda()
@@ -351,6 +364,7 @@ public class NewsController {
 
     @GetMapping("/count-relation")
     @ApiOperation(value = "公告阅读权限统计")
+    @SaCheckPermission("news:countrelation")
     @XjrLog(value = "公告阅读权限统计")
     public RT<Long[]> countRelation(@RequestParam Long id) {
         Long total = newsRelationService.count(Wrappers.<NewsRelation>query().lambda().eq(NewsRelation::getNewsId, id));
@@ -364,6 +378,7 @@ public class NewsController {
 
     @PutMapping("/update-relation")
     @ApiOperation(value = "设置新闻阅读权限")
+    @SaCheckPermission("news:updaterelation")
     @XjrLog(value = "设置新闻阅读权限", saveResponseData = true)
     public RT<Boolean> updateRelation(@RequestBody UpdateNewsRelationDto updateRelationDto) {
         return RT.ok(newsService.updateRelation(updateRelationDto));
@@ -371,6 +386,7 @@ public class NewsController {
 
     @DeleteMapping("/delete-relation")
     @ApiOperation(value = "删除新闻阅读权限")
+    @SaCheckPermission("news:deleterelation")
     @XjrLog(value = "删除新闻阅读权限", saveResponseData = true)
     public RT<Boolean> deleteRelation(@RequestBody DeleteNewsRelationDto deleteNewsRelationDto) {
         return RT.ok(newsService.deleteRelation(deleteNewsRelationDto));
@@ -378,6 +394,7 @@ public class NewsController {
 
     @GetMapping("/count-type")
     @ApiOperation(value = "未读类型统计")
+    @SaCheckPermission("news:counttype")
     @XjrLog(value = "未读类型统计")
     public RT<List<NewsCountTypeVo>> countType() {
         List<NewsCountTypeVo> newsCountTypeVoList = new ArrayList<>();
@@ -507,6 +524,7 @@ public class NewsController {
 
     @GetMapping("/send-message")
     @ApiOperation(value = "发送消息")
+    @SaCheckPermission("news:sendmessage")
     @XjrLog(value = "发送消息", saveResponseData = true)
     public RT<Boolean> sendMessage(@RequestParam Long id) {
         return RT.ok(newsService.SendMessage(id));
@@ -514,6 +532,7 @@ public class NewsController {
 
     @GetMapping("/unread-count")
     @ApiOperation(value = "获取登录人未读消息数量")
+    @SaCheckPermission("news:unreadcount")
     @XjrLog(value = "获取登录人未读消息数量", saveResponseData = true)
     public RT<Long> unreadCount() {
         Long notReadCountNews = newsService.count(
@@ -544,6 +563,7 @@ public class NewsController {
 
     @GetMapping("/all-read")
     @ApiOperation(value = "全部已读")
+    @SaCheckPermission("news:allread")
     @XjrLog(value = "全部已读", saveResponseData = true)
     public RT<Boolean> allRead() {
         return RT.ok(newsService.allRead(StpUtil.getLoginIdAsLong()));

+ 3 - 3
src/main/java/com/xjrsoft/module/oa/controller/OfficialDocumentPostController.java

@@ -48,7 +48,7 @@ public class OfficialDocumentPostController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "公文发文列表(分页)")
-    @SaCheckPermission("officialdocumentpost:detail")
+    @SaCheckPermission("officialdocumentpost:page")
     @XjrLog(value = "公文发文列表(分页)")
     public RT<PageOutput<OfficialDocumentPostPageVo>> page(@Valid OfficialDocumentPostPageDto dto) {
 
@@ -63,7 +63,7 @@ public class OfficialDocumentPostController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询公文发文信息")
-    @SaCheckPermission("officialdocumentpost:detail")
+    @SaCheckPermission("officialdocumentpost:info")
     @XjrLog(value = "根据id查询公文发文信息", saveResponseData = true)
     public RT<OfficialDocumentPostVo> info(@RequestParam Long id) {
         OfficialDocumentPost officialDocumentPost = officialDocumentPostService.getById(id);
@@ -75,7 +75,7 @@ public class OfficialDocumentPostController {
 
     @GetMapping(value = "/init-post-number")
     @ApiOperation(value = "新增时初始化公文号")
-    @SaCheckPermission("officialdocumentpost:detail")
+    @SaCheckPermission("officialdocumentpost:initpostnumber")
     @XjrLog(value = "新增时初始化公文号", saveResponseData = true)
     public RT<String> initPostNumber() {
         String maxPostNumber = officialDocumentPostService.getMaxPostNumber();

+ 5 - 5
src/main/java/com/xjrsoft/module/oa/controller/OfficialDocumentReceivedController.java

@@ -64,7 +64,7 @@ public class OfficialDocumentReceivedController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "公文收文列表(分页)")
-    @SaCheckPermission("officialdocumentreceived:detail")
+    @SaCheckPermission("officialdocumentreceived:page")
     @XjrLog(value = "公文收文列表(分页)")
     public RT<PageOutput<OfficialDocumentReceivedPageVo>> page(@Valid OfficialDocumentReceivedPageDto dto) {
 
@@ -79,7 +79,7 @@ public class OfficialDocumentReceivedController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询公文收文信息")
-    @SaCheckPermission("officialdocumentreceived:detail")
+    @SaCheckPermission("officialdocumentreceived:info")
     @XjrLog(value = "根据id查询公文收文信息", saveResponseData = true)
     public RT<OfficialDocumentReceivedVo> info(@RequestParam Long id) {
         OfficialDocumentReceived officialDocumentReceived = officialDocumentReceivedService.getById(id);
@@ -165,7 +165,7 @@ public class OfficialDocumentReceivedController {
 
     @GetMapping(value = "/init-received-number")
     @ApiOperation(value = "新增时初始化公文号")
-    @SaCheckPermission("officialdocumentpost:detail")
+    @SaCheckPermission("officialdocumentreceived:initreceivednumber")
     @XjrLog(value = "新增时初始化公文号", saveResponseData = true)
     public RT<String> initReceivedNumber() {
         String maxReceivedNumber = officialDocumentReceivedService.getMaxReceivedNumber();
@@ -175,7 +175,7 @@ public class OfficialDocumentReceivedController {
 
     @GetMapping(value = "/nextReviewerList")
     @ApiOperation(value = "获取当前行政收文流程下一节点审核人列表")
-    @SaCheckPermission("officialdocumentpost:detail")
+    @SaCheckPermission("officialdocumentreceived:nextReviewerList")
     @XjrLog(value = "获取当前行政收文流程下一节点审核人列表", saveResponseData = true)
     public RT<List<NextReviewerListVo>> nextReviewerList(@RequestParam String taskId) {
         List<NextReviewerListVo> result = officialDocumentReceivedService.nextReviewerList(taskId);
@@ -184,7 +184,7 @@ public class OfficialDocumentReceivedController {
 
     @GetMapping(value = "/nextExecutorList")
     @ApiOperation(value = "获取当前行政收文流程下一节点落实人列表")
-    @SaCheckPermission("officialdocumentpost:detail")
+    @SaCheckPermission("officialdocumentreceived:nextExecutorList")
     @XjrLog(value = "获取当前行政收文流程下一节点落实人列表", saveResponseData = true)
     public RT<List<NextReviewerListVo>> nextExecutorList(@RequestParam String taskId) {
         List<NextReviewerListVo> result = officialDocumentReceivedService.nextExecutorList(taskId);

+ 5 - 5
src/main/java/com/xjrsoft/module/oa/controller/OfficialDocumentReceivedHandleController.java

@@ -48,7 +48,7 @@ public class OfficialDocumentReceivedHandleController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value="公文收文-承办表列表(分页)")
-    @SaCheckPermission("officialdocumentreceivedhandle:detail")
+    @SaCheckPermission("officialdocumentreceivedhandle:page")
     @XjrLog(value = "公文收文-承办表列表(分页)")
     public RT<PageOutput<OfficialDocumentReceivedHandlePageVo>> page(@Valid OfficialDocumentReceivedHandlePageDto dto){
         Page<OfficialDocumentReceivedHandlePageVo> page = officialDocumentReceivedHandleService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
@@ -58,7 +58,7 @@ public class OfficialDocumentReceivedHandleController {
 
     @GetMapping(value = "last-alert-time")
     @ApiOperation(value = "新增公文收文-承办表-最新提醒时间")
-    @SaCheckPermission("officialdocumentreceivedhandle:add")
+    @SaCheckPermission("officialdocumentreceivedhandle:lastalerttime")
     @XjrLog(value = "新增公文收文-承办表-最新提醒时间")
     public RT<LastOfficialDocumentReceivedHandleAlertVo> lastAlertTime(@RequestParam Long id){
         List<OfficialDocumentReceivedHandle> list = officialDocumentReceivedHandleService.list(
@@ -81,7 +81,7 @@ public class OfficialDocumentReceivedHandleController {
 
     @PostMapping(value = "alert-set")
     @ApiOperation(value = "新增公文收文-承办表-提醒设置")
-    @SaCheckPermission("officialdocumentreceivedhandle:add")
+    @SaCheckPermission("officialdocumentreceivedhandle:alertset")
     @XjrLog(value = "新增公文收文-承办表-提醒设置")
     public RT<Boolean> alertSet(@Valid @RequestBody AddOfficialDocumentReceivedHandleAlertSetDto dto){
         return RT.ok(officialDocumentReceivedHandleService.addAlertTime(dto));
@@ -90,7 +90,7 @@ public class OfficialDocumentReceivedHandleController {
 
     @PostMapping(value = "handle")
     @ApiOperation(value = "新增公文收文-承办表-处理")
-    @SaCheckPermission("officialdocumentreceivedhandle:add")
+    @SaCheckPermission("officialdocumentreceivedhandle:handle")
     @XjrLog(value = "新增公文收文-承办表-处理")
     public RT<Boolean> handle(@Valid @RequestBody AddOfficialDocumentReceivedHandleDto dto){
         return RT.ok(officialDocumentReceivedHandleService.handle(dto));
@@ -98,7 +98,7 @@ public class OfficialDocumentReceivedHandleController {
 
     @PostMapping(value = "transfer")
     @ApiOperation(value = "新增公文收文-承办表-转办")
-    @SaCheckPermission("officialdocumentreceivedhandle:add")
+    @SaCheckPermission("officialdocumentreceivedhandle:transfer")
     @XjrLog(value = "新增公文收文-承办表-转办")
     public RT<Boolean> transfer(@Valid @RequestBody AddOfficialDocumentReceivedHandleDto dto){
         return RT.ok(officialDocumentReceivedHandleService.transfer(dto));

+ 19 - 0
src/main/java/com/xjrsoft/module/oa/controller/ProclamationController.java

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.oa.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
@@ -69,6 +70,7 @@ public class ProclamationController {
 
     @GetMapping(value = "/gradeClassTree")
     @ApiOperation(value = "公告年级班级树")
+    @SaCheckPermission("proclamation:gradeclasstree")
     @XjrLog(value = "公告年级班级树")
     public RT<List<NewsGradeClassTreeVo>> gradeClassTree() {
         List<NewsGradeClassTreeVo> list = newsService.getGradeClassTree();
@@ -80,6 +82,7 @@ public class ProclamationController {
 
     @GetMapping("/manage-box")
     @ApiOperation(value = "获取管理公告分页")
+    @SaCheckPermission("proclamation:managebox")
     @XjrLog(value = "获取管理公告分页")
     public RT<PageOutput<ProclamationPageVo>> manageBox(ProclamationPageDto dto) {
         IPage<ProclamationPageVo> page = newsService.proclamationManageBox(dto);
@@ -89,6 +92,7 @@ public class ProclamationController {
 
     @GetMapping("/receipt-box")
     @ApiOperation(value = "获取接受公告分页")
+    @SaCheckPermission("proclamation:receiptbox")
     @XjrLog(value = "获取接受公告分页")
     public RT<PageOutput<ProclamationPageVo>> receiptBox(ProclamationPageDto dto) {
         IPage<ProclamationPageVo> page = newsService.proclamationReceiptBox(dto);
@@ -99,6 +103,7 @@ public class ProclamationController {
 
     @PostMapping
     @ApiOperation(value = "新增公告")
+    @SaCheckPermission("proclamation:add")
     @XjrLog(value = "新增公告", saveResponseData = true)
     public RT<Boolean> add(@RequestBody AddProclamationDto addProclamationDto) {
         Long newsId = newsService.addProclamation(addProclamationDto);
@@ -112,6 +117,7 @@ public class ProclamationController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "公告详情")
+    @SaCheckPermission("proclamation:info")
     @XjrLog(value = "公告详情", saveResponseData = true)
     public RT<ProclamationVo> info(@RequestParam Long id) {
         ProclamationVo proclamationVo = newsService.getProclamationById(id);
@@ -123,6 +129,7 @@ public class ProclamationController {
 
     @PutMapping
     @ApiOperation(value = "修改公告")
+    @SaCheckPermission("proclamation:edit")
     @XjrLog(value = "修改公告", saveResponseData = true)
     public RT<Boolean> update(@RequestBody UpdateProclamationDto updateProclamationDto) {
         //News news = BeanUtil.toBean(updateNewsDto, News.class);
@@ -131,6 +138,7 @@ public class ProclamationController {
 
     @DeleteMapping
     @ApiOperation(value = "删除公告")
+    @SaCheckPermission("proclamation:delete")
     @XjrLog(value = "删除公告", saveResponseData = true)
     public RT<Boolean> delete(@RequestBody List<Long> ids) {
         return RT.ok(newsService.delete(ids));
@@ -139,6 +147,7 @@ public class ProclamationController {
 
     @PutMapping("/change-status")
     @ApiOperation(value = "发布或下架公告")
+    @SaCheckPermission("proclamation:changestatus")
     @XjrLog(value = "发布或下架公告", saveResponseData = true)
     public RT<Boolean> changeStatus(@RequestBody ChangeNewsDto changeNewsDto) {
         if (newsService.changeStatus(changeNewsDto)) {
@@ -151,6 +160,7 @@ public class ProclamationController {
 
     @PutMapping("/read")
     @ApiOperation(value = "读公告")
+    @SaCheckPermission("proclamation:read")
     @XjrLog(value = "读公告", saveResponseData = true)
     public RT<Boolean> read(@RequestBody List<Long> ids) {
         List<NewsRelation> toSaveList = newsRelationService.list(
@@ -169,6 +179,7 @@ public class ProclamationController {
 
     @PutMapping("/reply")
     @ApiOperation(value = "公告回复")
+    @SaCheckPermission("proclamation:reply")
     @XjrLog(value = "公告回复", saveResponseData = true)
     public RT<Boolean> reply(@RequestBody NewsReplyDto newsReplyDto) {
         NewsRelation newsRelation = newsRelationService.getOne(
@@ -195,6 +206,7 @@ public class ProclamationController {
 
     @GetMapping("/page-relation")
     @ApiOperation(value = "获取公告阅读权限分页")
+    @SaCheckPermission("proclamation:pagerelation")
     @XjrLog(value = "获取公告阅读权限分页")
     public RT<PageOutput<NewsRelationVo>> pageRelation(NewsRelationPageDto dto) {
 
@@ -215,6 +227,7 @@ public class ProclamationController {
 
     @GetMapping("/page-relation-config")
     @ApiOperation(value = "获取公告权限分页")
+    @SaCheckPermission("proclamation:pagerelationconfig")
     @XjrLog(value = "获取公告权限分页")
     public RT<PageOutput<NewsRelationConfigVo>> pageRelationConfig(NewsRelationPageDto dto) {
         Wrapper<NewsRelationConfig> wrapper = Wrappers.<NewsRelationConfig>query().lambda()
@@ -228,6 +241,7 @@ public class ProclamationController {
 
     @PutMapping("/update-relation")
     @ApiOperation(value = "设置公告阅读权限")
+    @SaCheckPermission("proclamation:updaterelation")
     @XjrLog(value = "设置公告阅读权限", saveResponseData = true)
     public RT<Boolean> updateRelation(@RequestBody UpdateNewsRelationDto updateRelationDto) {
         return RT.ok(newsService.updateRelation(updateRelationDto));
@@ -235,6 +249,7 @@ public class ProclamationController {
 
     @DeleteMapping("/delete-relation")
     @ApiOperation(value = "删除公告阅读权限")
+    @SaCheckPermission("proclamation:deleterelation")
     @XjrLog(value = "删除公告阅读权限", saveResponseData = true)
     public RT<Boolean> deleteRelation(@RequestBody DeleteNewsRelationDto deleteNewsRelationDto) {
         return RT.ok(newsService.deleteRelation(deleteNewsRelationDto));
@@ -242,6 +257,7 @@ public class ProclamationController {
 
     @GetMapping("/count-relation")
     @ApiOperation(value = "公告阅读权限统计")
+    @SaCheckPermission("proclamation:countrelation")
     @XjrLog(value = "公告阅读权限统计", saveResponseData = true)
     public RT<Long[]> countRelation(@RequestParam Long id) {
         Long total = newsRelationService.count(Wrappers.<NewsRelation>query().lambda().eq(NewsRelation::getNewsId, id));
@@ -255,6 +271,7 @@ public class ProclamationController {
 
     @GetMapping("/count-type")
     @ApiOperation(value = "未读类型统计")
+    @SaCheckPermission("proclamation:counttype")
     @XjrLog(value = "未读类型统计", saveResponseData = true)
     public RT<List<NewsCountTypeVo>> countType() {
         List<NewsCountTypeVo> newsCountTypeVoList = new ArrayList<>();
@@ -300,6 +317,7 @@ public class ProclamationController {
 
     @GetMapping("/send-message")
     @ApiOperation(value = "发送消息")
+    @SaCheckPermission("proclamation:sendmessage")
     @XjrLog(value = "发送消息", saveResponseData = true)
     public RT<Boolean> sendMessage(@RequestParam Long id) {
         return RT.ok(newsService.SendMessage(id));
@@ -307,6 +325,7 @@ public class ProclamationController {
 
     @GetMapping("/unread-count")
     @ApiOperation(value = "获取登录人未读消息数量")
+    @SaCheckPermission("proclamation:unreadcount")
     @XjrLog(value = "获取登录人未读消息数量", saveResponseData = true)
     public RT<Integer> unreadCount() {
         Integer count = newsService.selectJoinCount(

+ 6 - 0
src/main/java/com/xjrsoft/module/oa/controller/ScheduleController.java

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.oa.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
@@ -47,6 +48,7 @@ public class ScheduleController {
 
     @GetMapping
     @ApiOperation(value = "获取日程管理列表")
+    @SaCheckPermission("schedule:list")
     @XjrLog(value = "获取日程管理列表")
     public RT<List<ScheduleListVo>> list() {
         List<Schedule> scheduleList = scheduleService.list(Wrappers.<Schedule>query().lambda()
@@ -76,6 +78,7 @@ public class ScheduleController {
 
     @PostMapping
     @ApiOperation(value = "添加日程管理")
+    @SaCheckPermission("schedule:add")
     @XjrLog(value = "添加日程管理", saveResponseData = true)
     public RT<Boolean> add(@RequestBody AddScheduleDto scheduleDto) {
         Schedule schedule = BeanUtil.toBean(scheduleDto, Schedule.class);
@@ -86,6 +89,7 @@ public class ScheduleController {
 
     @PutMapping
     @ApiOperation(value = "修改日程管理")
+    @SaCheckPermission("schedule:edit")
     @XjrLog(value = "修改日程管理", saveResponseData = true)
     public RT<Boolean> update(@RequestBody UpdateScheduleDto scheduleDto) {
         Schedule schedule = BeanUtil.toBean(scheduleDto, Schedule.class);
@@ -94,6 +98,7 @@ public class ScheduleController {
 
     @DeleteMapping
     @ApiOperation(value = "删除日程管理")
+    @SaCheckPermission("schedule:delete")
     @XjrLog(value = "删除日程管理", saveResponseData = true)
     public RT<Boolean> delete(@RequestBody List<Long> ids) {
         return RT.ok(scheduleService.delete(ids));
@@ -101,6 +106,7 @@ public class ScheduleController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "日程详情")
+    @SaCheckPermission("schedule:info")
     @XjrLog(value = "日程详情", saveResponseData = true)
     public RT<ScheduleVo> info(@RequestParam Long id) {
         Schedule schedule = scheduleService.getById(id);

+ 15 - 15
src/main/java/com/xjrsoft/module/oa/controller/WfMeetingApplyController.java

@@ -69,7 +69,7 @@ public class WfMeetingApplyController {
 
     @GetMapping(value = "/list_meeting_room")
     @ApiOperation(value="会议室列表(不分页)")
-    @SaCheckPermission("wfmeetingapply:detail")
+    @SaCheckPermission("wfmeetingapply:listmeetingroom")
     @XjrLog(value = "会议室列表(分页)")
     public RT<List<MeetingRoomListVo>> listMeetingRoom(@Valid MeetingRoomListDto dto){
         List<MeetingRoomListVo> meetingRoomListVoList = wfMeetingApplyService.listMeetingRoom(dto);
@@ -78,7 +78,7 @@ public class WfMeetingApplyController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value="列表(分页)")
-    @SaCheckPermission("wfmeetingapply:detail")
+    @SaCheckPermission("wfmeetingapply:page")
     @XjrLog(value = "列表(分页)")
     public RT<PageOutput<WfMeetingApplyPageVo>> page(@Valid WfMeetingApplyPageDto dto){
         IPage<WfMeetingApplyPageVo> page = wfMeetingApplyService.pageRabAndHand(dto);
@@ -88,7 +88,7 @@ public class WfMeetingApplyController {
 
     @GetMapping(value = "/page-today-meeting-mobile")
     @ApiOperation(value="移动端今日会议列表(分页)")
-    @SaCheckPermission("wfmeetingapply:detail")
+    @SaCheckPermission("wfmeetingapply:pagetodaymeetingmobile")
     @XjrLog(value = "移动端今日会议列表(分页)")
     public RT<PageOutput<TodayMeetingMobilePageVo>> todayMeetingMobilePage(@Valid TodayMeetingMobilePageDto dto){
         IPage<TodayMeetingMobilePageVo> page = wfMeetingApplyService.todayMeetingMobilePage(dto);
@@ -98,7 +98,7 @@ public class WfMeetingApplyController {
 
     @GetMapping(value = "/page-sponsor-meeting-mobile")
     @ApiOperation(value="移动端我发起的会议列表(分页)")
-    @SaCheckPermission("wfmeetingapply:detail")
+    @SaCheckPermission("wfmeetingapply:pagesponsormeetingmobile")
     @XjrLog(value = "移动端我发起的会议列表(分页)")
     public RT<PageOutput<SponsorMeetingMobilePageVo>> sponsorMeetingMobilePage(@Valid SponsorMeetingMobilePageDto dto){
         IPage<SponsorMeetingMobilePageVo> page = wfMeetingApplyService.sponsorMeetingMobilePage(dto);
@@ -108,7 +108,7 @@ public class WfMeetingApplyController {
 
     @GetMapping(value = "/page-history-meeting-mobile")
     @ApiOperation(value="移动端历史会议列表(分页)")
-    @SaCheckPermission("wfmeetingapply:detail")
+    @SaCheckPermission("wfmeetingapply:pagehistorymeetingmobile")
     @XjrLog(value = "移动端历史会议列表(分页)")
     public RT<PageOutput<HistoryMeetingMobilePageVo>> historyMeetingMobilePage(@Valid HistoryMeetingMobilePageDto dto){
         IPage<HistoryMeetingMobilePageVo> page = wfMeetingApplyService.historyMeetingMobilePage(dto);
@@ -118,7 +118,7 @@ public class WfMeetingApplyController {
 
     @GetMapping(value = "/mobile-info")
     @ApiOperation(value="移动端会议信息会议的详情")
-    @SaCheckPermission("wfmeetingapply:detail")
+    @SaCheckPermission("wfmeetingapply:mobileinfo")
     @XjrLog(value = "移动端会议信息会议的详情")
     public RT<MeetingMobileInfoVo> mobileInfo(@RequestParam Long id){
         MeetingMobileInfoVo meetingMobileInfoVo = wfMeetingApplyService.mobileInfo(id);
@@ -127,7 +127,7 @@ public class WfMeetingApplyController {
 
     @GetMapping(value = "/info_in_workflow")
     @ApiOperation(value="按照流程查看详情")
-    @SaCheckPermission("wfmeetingapply:detail")
+    @SaCheckPermission("wfmeetingapply:infoinworkflow")
     @XjrLog(value = "按照流程查看详情")
     public RT<WfMeetingApplyInWorkflowVo> infoInWorkflow(@RequestParam Long id){
         WfMeetingApplyInWorkflowVo wfMeetingApplyInWorkflowVo = wfMeetingApplyService.infoInWorkflow(id);
@@ -139,7 +139,7 @@ public class WfMeetingApplyController {
 
     @GetMapping(value = "/meeting_conferee_list")
     @ApiOperation(value="参会人员列表(不分页)")
-    @SaCheckPermission("wfmeetingapply:detail")
+    @SaCheckPermission("wfmeetingapply:meetingconfereelist")
     @XjrLog(value = "参会人员列表(分页)")
     public RT<List<MeetingConfereeListVo>> listMeetingConferee(@Valid MeetingConfereeListDto dto){
         List<MeetingConfereeListVo> meetingConfereeListVoList = wfMeetingApplyService.listMeetingConferee(dto);
@@ -148,7 +148,7 @@ public class WfMeetingApplyController {
 
     @GetMapping(value = "/meeting_conferee_opinion_list")
     @ApiOperation(value="参会意见列表(不分页)")
-    @SaCheckPermission("wfmeetingapply:detail")
+    @SaCheckPermission("wfmeetingapply:meetingconfereeopinionlist")
     @XjrLog(value = "参会人员列表(分页)")
     public RT<List<MeetingConfereeOpinionListVo>> listMeetingConfereeOpinion(@Valid MeetingConfereeOpinionListDto dto){
         List<MeetingConfereeOpinionListVo> meetingConfereeOpinionListVos = wfMeetingApplyService.listMeetingConfereeOpinion(dto);
@@ -157,7 +157,7 @@ public class WfMeetingApplyController {
 
     @PostMapping(value = "/update_meetingSummary")
     @ApiOperation(value = "编辑会议纪要")
-    @SaCheckPermission("wfmeetingapply:edit")
+    @SaCheckPermission("wfmeetingapply:updatemeetingSummary")
     @XjrLog(value = "编辑会议纪要")
     @Transactional(rollbackFor = Exception.class)
     public RT<Boolean> updateMeetingSummary(@Valid @RequestBody UpdateMeetingSummaryDto dto){
@@ -170,7 +170,7 @@ public class WfMeetingApplyController {
 
     @GetMapping(value = "/meetingSummary_info")
     @ApiOperation(value="获取会议纪要")
-    @SaCheckPermission("wfmeetingapply:detail")
+    @SaCheckPermission("wfmeetingapply:meetingSummaryinfo")
     @XjrLog(value = "获取会议纪要")
     public RT<MeetingSummaryVo> meetingSummaryInfo(@RequestParam Long id){
         WfMeetingApply wfMeetingApply = wfMeetingApplyService.getById(id);
@@ -190,7 +190,7 @@ public class WfMeetingApplyController {
 
     @PutMapping(value = "/update_revocation_meeting")
     @ApiOperation(value = "撤销会议申请")
-    @SaCheckPermission("wfmeetingapply:edit")
+    @SaCheckPermission("wfmeetingapply:updaterevocationmeeting")
     @XjrLog(value = "撤销会议申请")
     public RT<Boolean> updateRevocationMeeting(@Valid @RequestBody UpdateRevocationMeetingDto dto){
         return RT.ok(wfMeetingApplyService.updateRevocationMeeting(dto));
@@ -198,7 +198,7 @@ public class WfMeetingApplyController {
 
     @PutMapping(value = "/update_meeting_check_in")
     @ApiOperation(value = "签到")
-    @SaCheckPermission("wfmeetingapply:edit")
+    @SaCheckPermission("wfmeetingapply:updatemeetingcheckin")
     @XjrLog(value = "签到")
     public RT<Boolean> updateMeetingCheckIn(@Valid @RequestBody UpdateMeetingCheckInDto dto){
         return RT.ok(wfMeetingApplyService.updateMeetingCheckIn(dto));
@@ -206,7 +206,7 @@ public class WfMeetingApplyController {
 
     @PostMapping(value = "/add_meeting_conferee_opinion")
     @ApiOperation(value = "参会意见提交")
-    @SaCheckPermission("wfmeetingapply:add")
+    @SaCheckPermission("wfmeetingapply:addmeetingconfereeopinion")
     @XjrLog(value = "参会意见提交")
     public RT<Boolean> addMeetingConfereeOpinion(@Valid @RequestBody AddMeetingConfereeOpinionDto dto){
         boolean isSuccess = wfMeetingApplyService.addMeetingConfereeOpinion(dto);
@@ -215,7 +215,7 @@ public class WfMeetingApplyController {
 
     @GetMapping(value = "/meeting-check-in-qrcode")
     @ApiOperation(value = "会议签到二维码-生成二维码")
-    @SaCheckPermission("wfmeetingapply:detail")
+    @SaCheckPermission("wfmeetingapply:meetingcheckinqrcode")
     @XjrLog(value = "会议签到二维码-生成二维码")
     public RT<String> qrcode(@RequestParam Long id) throws Exception {
         String url = commonPropertiesConfig.getDomainApp() + "/pages/meeting/detail?id=" + id + "&type=0";

+ 11 - 0
src/main/java/com/xjrsoft/module/organization/controller/DepartmentController.java

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.organization.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -65,6 +66,7 @@ public class DepartmentController {
 
     @GetMapping(value = "/list")
     @ApiOperation(value = "机构列表(不分页)")
+    @SaCheckPermission("department:list")
     @XjrLog(value = "获取不分页机构列表")
     public R list(DepartmentPageDto dto) {
         List<Department> list = departmentService.list(
@@ -80,6 +82,7 @@ public class DepartmentController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "机构列表(分页)")
+    @SaCheckPermission("department:page")
     @XjrLog(value = "获取分页机构列表")
     public R page(DepartmentPageDto dto) {
 
@@ -98,6 +101,7 @@ public class DepartmentController {
 
     @GetMapping(value = "/enabled-tree")
     @ApiOperation(value = "机构树")
+    @SaCheckPermission("department:enabledtree")
     @XjrLog(value = "部门展示 所有数据")
     public R tree(DepartmentTreeDto dto) {
 
@@ -114,6 +118,7 @@ public class DepartmentController {
 
     @GetMapping(value = "/tree")
     @ApiOperation(value = "部门展示 (忽略 未启用的数据)")
+    @SaCheckPermission("department:tree")
     @XjrLog(value = "部门展示 (忽略 未启用的数据)")
     public R treeEnabled(DepartmentTreeDto dto) {
         List<Department> list = departmentService.list(Wrappers.<Department>lambdaQuery()
@@ -158,6 +163,7 @@ public class DepartmentController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询机构信息")
+    @SaCheckPermission("department:info")
     @XjrLog(value = "id查询获取机构信息")
     public R info(@RequestParam Long id) {
         Department dept = departmentService.getById(id);
@@ -169,6 +175,7 @@ public class DepartmentController {
 
     @PostMapping
     @ApiOperation(value = "新增机构")
+    @SaCheckPermission("department:add")
     @XjrLog(value = "新增机构")
     public R add(@Valid @RequestBody AddDepartmentDto dto) {
         long count = departmentService.count(Wrappers.<Department>query().lambda().eq(Department::getName, dto.getName()).or().eq(Department::getCode, dto.getCode()));
@@ -201,6 +208,7 @@ public class DepartmentController {
 
     @PutMapping
     @ApiOperation(value = "修改机构")
+    @SaCheckPermission("department:edit")
     @XjrLog(value = "修改机构")
     public R update(@Valid @RequestBody UpdateDepartmentDto dto) {
 
@@ -231,6 +239,7 @@ public class DepartmentController {
 
     @DeleteMapping
     @ApiOperation(value = "删除")
+    @SaCheckPermission("department:delete")
     @XjrLog(value = "删除机构")
     public R delete(@RequestBody List<Long> ids) {
         //删除岗位时,需要判断,此机构下是不是存在人员,存在人员就不能删除
@@ -254,6 +263,7 @@ public class DepartmentController {
 
     @PostMapping("add-dept-user")
     @ApiOperation(value = "添加人员(组织)")
+    @SaCheckPermission("department:adddeptuser")
     @Transactional(rollbackFor = Exception.class)
     @XjrLog(value = "添加人员(组织)", saveResponseData = true)
     public R addDeptUser(@Valid @RequestBody AddDepartmentUserDto dto) {
@@ -280,6 +290,7 @@ public class DepartmentController {
 
     @GetMapping(value = "/dept-user-info")
     @ApiOperation(value = "根据组织id查询组织下的人员")
+    @SaCheckPermission("department:deptuserinfo")
     @XjrLog(value = "根据组织id查询组织下的人员", saveResponseData = true)
     public R DeptUserInfo(@RequestParam Long id) {
         List<Long> userIdList = userDeptRelationService.list(Wrappers.<UserDeptRelation>query().lambda().eq(UserDeptRelation::getDeptId, id)).stream().map(UserDeptRelation::getUserId).collect(Collectors.toList());

+ 4 - 0
src/main/java/com/xjrsoft/module/organization/controller/DingtalkController.java

@@ -1,6 +1,7 @@
 package com.xjrsoft.module.organization.controller;
 
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.xjrsoft.common.annotation.XjrLog;
 import com.xjrsoft.common.constant.GlobalConstant;
 import com.xjrsoft.common.model.result.R;
@@ -40,6 +41,7 @@ public class DingtalkController {
 
     @PutMapping("/sync-user")
     @ApiOperation(value = "钉钉信息更新")
+    @SaCheckPermission("dingtalk:syncuser")
     @XjrLog(value = "钉钉用户部门同步更新")
     public R updateInfo() throws Exception {
         dingtalkService.updateInfo();
@@ -55,6 +57,7 @@ public class DingtalkController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "获取员工分页信息")
+    @SaCheckPermission("dingtalk:page")
     @XjrLog(value = "获取员工分页信息")
     public R page(WeChatPageDto dto) {
         return R.ok(userService.getPage(dto));
@@ -62,6 +65,7 @@ public class DingtalkController {
 
     @GetMapping(value = "/departpage")
     @ApiOperation(value = "获取部门分页信息")
+    @SaCheckPermission("dingtalk:departpage")
     @XjrLog(value = "获取部门分页信息")
     public R page(WeChatDepartPageDto dto) {
         return R.ok(departmentService.Ipage(dto));

+ 12 - 0
src/main/java/com/xjrsoft/module/organization/controller/PostController.java

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.organization.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -63,6 +64,7 @@ public class PostController {
 
     @GetMapping(value = "/list")
     @ApiOperation(value = "岗位列表(不分页)")
+    @SaCheckPermission("post:list")
     @XjrLog(value = "岗位列表(不分页)")
     public R list(String keyword) {
         List<Post> list = postService.list(Wrappers.lambdaQuery(Post.class)
@@ -78,6 +80,7 @@ public class PostController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "岗位列表(分页)")
+    @SaCheckPermission("post:page")
     @XjrLog(value = "岗位列表(分页)")
     public R page(@Valid PostPageDto dto) {
 
@@ -99,6 +102,7 @@ public class PostController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询机构信息")
+    @SaCheckPermission("post:info")
     @XjrLog(value = "根据id查询机构信息", saveResponseData = true)
     public R info(@RequestParam Long id) {
         Post post = postService.getById(id);
@@ -110,6 +114,7 @@ public class PostController {
 
     @GetMapping(value = "/info/multi")
     @ApiOperation(value = "批量查询岗位信息")
+    @SaCheckPermission("post:infomulti")
     @XjrLog(value = "批量查询岗位信息", saveResponseData = true)
     public R multiInfo(@RequestParam String ids) {
         LambdaQueryWrapper<Post> queryWrapper = Wrappers.lambdaQuery(Post.class).in(Post::getId, Arrays.stream(ids.split(StringPool.COMMA)).toArray());
@@ -122,6 +127,7 @@ public class PostController {
 
     @PostMapping
     @ApiOperation(value = "新增岗位")
+    @SaCheckPermission("post:add")
     @XjrLog(value = "新增岗位", saveResponseData = true)
     public R add(@Valid @RequestBody AddPostDto dto) {
         long count = postService.count(Wrappers.<Post>query().lambda().eq(Post::getName, dto.getName()).or().eq(Post::getCode, dto.getCode()));
@@ -140,6 +146,7 @@ public class PostController {
 
     @PutMapping
     @ApiOperation(value = "修改岗位")
+    @SaCheckPermission("post:edit")
     @XjrLog(value = "修改岗位", saveResponseData = true)
     public R update(@Valid @RequestBody UpdatePostDto dto) {
 
@@ -162,6 +169,7 @@ public class PostController {
 
     @DeleteMapping
     @ApiOperation(value = "删除")
+    @SaCheckPermission("post:delete")
     @XjrLog(value = "删除岗位")
     public R delete(@Valid @RequestBody List<Long> ids) {
         //删除岗位时,需要判断,此岗位下是不是存在人员,存在人员就不能删除
@@ -190,6 +198,7 @@ public class PostController {
 
     @GetMapping(value = "/tree")
     @ApiOperation(value = "岗位机构树")
+    @SaCheckPermission("post:tree")
     @XjrLog(value = "岗位展示")
     public R tree(PostTreeDto dto) {
         //如果deptId有子集组织,也需要把子集组织的用户一起显示出来
@@ -227,6 +236,7 @@ public class PostController {
 
     @GetMapping(value = "/get-post-user")
     @ApiOperation(value = "根据岗位id查询所拥有的用户")
+    @SaCheckPermission("post:getpostuser")
     @XjrLog(value = "根据岗位id查询所拥有的用户", saveResponseData = true)
     public R getUserByPostId(@RequestParam Long id) {
         List<UserPostRelation> list = userPostRelationService.list(Wrappers.<UserPostRelation>query().lambda().eq(UserPostRelation::getPostId, id));
@@ -242,6 +252,7 @@ public class PostController {
 
     @PutMapping(value = "/update-user-post-batch")
     @ApiOperation(value = "添加岗位下的人员")
+    @SaCheckPermission("post:updateuserpostbatch")
     @XjrLog(value = "添加岗位下的人员", saveResponseData = true)
     public R updatePostIdByUserId(@RequestBody UpdateUserPostDto dto) {
         //添加岗位下的人员以及人员的组织
@@ -250,6 +261,7 @@ public class PostController {
 
     @PostMapping("/switch-post")
     @ApiOperation(value = "切换岗位")
+    @SaCheckPermission("post:switchpost")
     @XjrLog(value = "切换岗位", saveResponseData = true)
     public R switchPost(@Valid @RequestBody SwitchPostDto dto) {
         return R.ok(postService.switchPost(dto));

+ 13 - 0
src/main/java/com/xjrsoft/module/organization/controller/RoleController.java

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.organization.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -70,6 +71,7 @@ public class RoleController {
 
     @GetMapping(value = "/list")
     @ApiOperation(value = "角色列表(不分页)")
+    @SaCheckPermission("role:list")
     @XjrLog(value = "角色列表(不分页)")
     public R list(RoleListDto dto) {
         List<Role> list = roleService.list(Wrappers.lambdaQuery(Role.class)
@@ -91,6 +93,7 @@ public class RoleController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "角色列表(分页)")
+    @SaCheckPermission("role:page")
     @XjrLog(value = "角色列表(分页)")
     public R page(@Valid RolePageDto dto) {
 
@@ -110,6 +113,7 @@ public class RoleController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询角色信息")
+    @SaCheckPermission("role:info")
     @XjrLog(value = "根据id查询角色信息", saveResponseData = true)
     public R info(@RequestParam Long id) {
         Role role = roleService.getById(id);
@@ -121,6 +125,7 @@ public class RoleController {
 
     @GetMapping(value = "/info/multi")
     @ApiOperation(value = "批量查询角色信息")
+    @SaCheckPermission("role:infomulti")
     @XjrLog(value = "批量查询角色信息", saveResponseData = true)
     public R multiInfo(@RequestParam String ids) {
         LambdaQueryWrapper<Role> queryWrapper = Wrappers.lambdaQuery(Role.class).in(Role::getId, Arrays.stream(ids.split(StringPool.COMMA)).toArray());
@@ -133,6 +138,7 @@ public class RoleController {
 
     @PostMapping
     @ApiOperation(value = "新增角色")
+    @SaCheckPermission("role:add")
     @XjrLog(value = "新增角色", saveResponseData = true)
     public R add(@Valid @RequestBody AddRoleDto dto) {
         long count = roleService.count(Wrappers.<Role>query().lambda().eq(Role::getName, dto.getName()).or().eq(Role::getCode, dto.getCode()));
@@ -151,6 +157,7 @@ public class RoleController {
 
     @PutMapping
     @ApiOperation(value = "修改角色")
+    @SaCheckPermission("role:edit")
     @XjrLog(value = "修改角色", saveResponseData = true)
     public R update(@Valid @RequestBody UpdateRoleDto dto) {
         Role byId = roleService.getById(dto.getId());
@@ -181,6 +188,7 @@ public class RoleController {
 
     @GetMapping("/user")
     @ApiOperation(value = "获取角色用户列表")
+    @SaCheckPermission("role:userlist")
     @XjrLog(value = "获取角色用户列表")
     public R userList(@RequestParam Long id) {
         List<UserRoleRelation> list = userRoleRelationService.list(Wrappers.<UserRoleRelation>query().lambda().eq(UserRoleRelation::getRoleId, id));
@@ -199,6 +207,7 @@ public class RoleController {
 
     @PostMapping("/user")
     @ApiOperation(value = "添加角色下的人员")
+    @SaCheckPermission("role:addroleuser")
     @XjrLog(value = "添加角色下的人员", saveResponseData = true)
     public R addRoleUser(@RequestBody AddRoleUserDto roleUserDto) {
         Long roleId = roleUserDto.getId();
@@ -224,6 +233,7 @@ public class RoleController {
 
     @PostMapping("/auth")
     @ApiOperation(value = "设置角色菜单权限")
+    @SaCheckPermission("role:auth")
     @XjrLog(value = "设置角色菜单权限", saveResponseData = true)
     public R auth(@Valid @RequestBody SetRoleAuthDto dto) {
         if (dto.getId().equals(GlobalConstant.SUPER_ADMIN_ROLE_ID)) {
@@ -234,6 +244,7 @@ public class RoleController {
 
     @GetMapping("/auth")
     @ApiOperation(value = "获取角色菜单权限")
+    @SaCheckPermission("role:authlist")
     @XjrLog(value = "获取角色菜单权限", saveResponseData = true)
     public R authList(@RequestParam Long id) {
         return R.ok(authorizeService.getRoleAuth(id));
@@ -242,6 +253,7 @@ public class RoleController {
 
     @PutMapping("/status")
     @ApiOperation(value = "修改角色状态")
+    @SaCheckPermission("role:status")
     @XjrLog(value = "修改角色状态", saveResponseData = true)
     public R updateEnabled(@Valid @RequestBody UpdateRoleStatusDto dto) {
         if (dto.getId().equals(GlobalConstant.SUPER_ADMIN_ROLE_ID)) {
@@ -254,6 +266,7 @@ public class RoleController {
 
     @DeleteMapping
     @ApiOperation(value = "删除角色")
+    @SaCheckPermission("role:delete")
     @XjrLog(value = "删除角色")
     public R delete(@RequestBody List<Long> ids) {
         if (ids.contains(1L)) {

+ 37 - 2
src/main/java/com/xjrsoft/module/organization/controller/UserController.java

@@ -134,6 +134,7 @@ public class UserController {
 
     @GetMapping(value = "/list")
     @ApiOperation(value = "用户列表(不分页)")
+    @SaCheckPermission("user:list")
     @XjrLog(value = "用户列表(不分页)")
     public R list(String keyword) {
         List<User> list = userService.list(Wrappers.lambdaQuery(User.class)
@@ -148,6 +149,7 @@ public class UserController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "用户列表(分页)")
+    @SaCheckPermission("user:page")
     @XjrLog(value = "用户列表(分页)")
     public R page(UserPageDto dto) {
         List<Long> deptIds = new ArrayList<>();
@@ -290,6 +292,7 @@ public class UserController {
 
     @GetMapping(value = "/person-page")
     @ApiOperation(value = "人员选择组件(分页)")
+    @SaCheckPermission("user:personpage")
     @XjrLog(value = "人员选择组件(分页)")
     public R personPage(PersonPageDto dto) {
         Page<PersonPageVo> voPage = userService.personPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
@@ -299,6 +302,7 @@ public class UserController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询用户信息")
+    @SaCheckPermission("user:info")
     @XjrLog(value = "根据id查询用户信息", saveResponseData = true)
     public R info(@RequestParam Long id) {
         User user = userService.getById(id);
@@ -323,6 +327,7 @@ public class UserController {
 
     @GetMapping(value = "/detail")
     @ApiOperation(value = "根据id查询用户信息")
+    @SaCheckPermission("user:detail")
     @XjrLog(value = "根据id查询用户信息", saveResponseData = true)
     public RT<UserDetailVo> detail(@RequestParam Long id) {
         User user = userService.getById(id);
@@ -341,6 +346,7 @@ public class UserController {
 
     @PostMapping
     @ApiOperation(value = "新增用户")
+    @SaCheckPermission("user:add")
     @XjrLog(value = "新增用户", saveRequestData = false, saveResponseData = true)
     public R add(@Valid @RequestBody AddUserDto dto) {
         if (!OrganizationUtil.validatePassword(dto.getPassword())) {
@@ -351,6 +357,7 @@ public class UserController {
 
     @PutMapping
     @ApiOperation(value = "修改用户 不能修改用户名")
+    @SaCheckPermission("user:edit")
     @XjrLog(value = "修改用户 不能修改用户名", saveRequestData = false, saveResponseData = true)
     public R update(@Valid @RequestBody UpdateUserDto dto) {
         return R.ok(userService.update(dto));
@@ -358,6 +365,7 @@ public class UserController {
 
     @GetMapping(value = "/current/info")
     @ApiOperation(value = "当前登录用户信息")
+    @SaCheckPermission("user:currentinfo")
     @XjrLog(value = "当前登录用户信息", saveResponseData = true)
     public R info() {
         SaSession tokenSession = StpUtil.getTokenSession();
@@ -425,6 +433,7 @@ public class UserController {
 
     @GetMapping(value = "/pending/count")
     @ApiOperation(value = "当前待办数量统计")
+    @SaCheckPermission("user:pendingcount")
     @XjrLog(value = "当前待办数量统计", saveResponseData = true)
     public RT<PendingCountDto> pendingCount() {
         PendingCountDto pendingCountDto = new PendingCountDto();
@@ -482,6 +491,7 @@ public class UserController {
 
     @GetMapping(value = "/reset-user-page")
     @ApiOperation(value = "移动端用户列表")
+    @SaCheckPermission("user:resetuserpage")
     @XjrLog(value = "移动端用户列表")
     public RT<PageOutput<ResetUserPageVo>> resetUserPage(UserPageDto dto) {
         PageOutput<ResetUserPageVo> userPage = userService.getResetUserPage(dto);
@@ -491,6 +501,7 @@ public class UserController {
 
     @GetMapping(value = "/reset-page-role-list")
     @ApiOperation(value = "移动端用户列表分类")
+    @SaCheckPermission("user:resetpagerolelist")
     @XjrLog(value = "移动端用户列表分类")
     public RT<List<ResetUserRoleVo>> resetUserTree() {
         List<ResetUserRoleVo> roleList = new ArrayList<>();
@@ -516,6 +527,7 @@ public class UserController {
 
     @GetMapping(value = "/pc-role-tree")
     @ApiOperation(value = "pc端用户列表分类")
+    @SaCheckPermission("user:pcroletree")
     @XjrLog(value = "pc端用户列表分类")
     public RT<List<ResetUserRoleVo>> pcRoleTree() {
         List<Department> departmentList = departmentService.list(
@@ -579,6 +591,7 @@ public class UserController {
 
     @PutMapping("/update/info")
     @ApiOperation(value = "登陆人修改自己得用户信息")
+    @SaCheckPermission("user:updateinfo")
     @XjrLog(value = "登陆人修改自己得用户信息", saveResponseData = true)
     public R updateInfo(@RequestBody @Valid UpdateInfoDto dto) {
         User updateUserInfo = BeanUtil.toBean(dto, User.class);
@@ -593,6 +606,7 @@ public class UserController {
 
     @PutMapping("/update/password")
     @ApiOperation(value = "当前登录用户修改本人密码")
+    @SaCheckPermission("user:updatepassword")
     @XjrLog(value = "当前登录用户修改本人密码", saveRequestData = false, saveResponseData = true)
     public RT<Boolean> updatePassword(@RequestBody @Valid UpdatePasswordDto dto) {
         if (!OrganizationUtil.validatePassword(dto.getNewPassword())) {
@@ -618,6 +632,7 @@ public class UserController {
 
     @PutMapping("/login/reset-password")
     @ApiOperation(value = "登录后修改密码")
+    @SaCheckPermission("user:resetpassword")
     @XjrLog(value = "登录后修改密码", saveRequestData = false, saveResponseData = true)
     public RT<Boolean> loginResetPassword(@RequestBody @Valid LoginResetPasswordDto dto) {
         if (!OrganizationUtil.validatePassword(dto.getNewPassword())) {
@@ -641,6 +656,7 @@ public class UserController {
 
     @PostMapping("/update/avatar")
     @ApiOperation(value = "当前登录用户修改头像")
+    @SaCheckPermission("user:updateavatar")
     @XjrLog(value = "当前登录用户修改头像", saveRequestData = false, saveResponseData = true)
     public R uploadAvatar(@RequestParam("file") MultipartFile file) throws Exception {
         if (file.isEmpty()) {
@@ -671,6 +687,7 @@ public class UserController {
 
     @DeleteMapping
     @ApiOperation(value = "删除用户(可批量)")
+    @SaCheckPermission("user:delete")
     @XjrLog(value = "删除用户(可批量)", saveResponseData = true)
     public R delete(@RequestBody List<Long> ids) {
         if (ids.contains(GlobalConstant.SUPER_ADMIN_USER_ID)) {
@@ -689,7 +706,7 @@ public class UserController {
 
     @PostMapping(value = "/change-status")
     @ApiOperation(value = "修改状态")
-    @SaCheckPermission("classroom:detail")
+    @SaCheckPermission("classroom:changestatus")
     @XjrLog(value = "修改状态", saveResponseData = true)
     public RT<Boolean> changeStatus(@Valid @RequestBody UserChangeStatusDto dto) throws Exception {
         List<User> list = userService.list(new QueryWrapper<User>().lambda()
@@ -705,6 +722,7 @@ public class UserController {
 
     @GetMapping("/info/multi")
     @ApiOperation(value = "批量获取用户信息")
+    @SaCheckPermission("user:infomulti")
     @XjrLog(value = "批量获取用户信息")
     public R usersInfo(@RequestParam String ids) {
         return R.ok(userService.getUsersInfo(ids));
@@ -712,6 +730,7 @@ public class UserController {
 
     @GetMapping("/enabled")
     @ApiOperation(value = "启用/禁用用户")
+    @SaCheckPermission("user:enabled")
     @XjrLog(value = "启用/禁用用户", saveResponseData = true)
     public R enabled(@RequestParam Long id) {
         User user = userService.getOne(Wrappers.<User>query().lambda().select(User::getEnabledMark).eq(User::getId, id), false);
@@ -730,6 +749,7 @@ public class UserController {
 
     @PutMapping("/reset-password")
     @ApiOperation(value = "重置密码")
+    @SaCheckPermission("user:resetpassword")
     @XjrLog(value = "重置密码", saveResponseData = true)
     public RT<Boolean> resetPassword(@RequestBody ResetPasswordDto dto) {
         return RT.ok(userService.resetPassword(dto));
@@ -737,6 +757,7 @@ public class UserController {
 
     @PutMapping("/batch-reset-password")
     @ApiOperation(value = "批量重置密码")
+    @SaCheckPermission("user:batchresetpassword")
     @XjrLog(value = "批量重置密码", saveResponseData = true)
     public RT<Boolean> batchResetPassword(@RequestBody List<Long> ids) {
         return RT.ok(userService.batchResetPassword(ids));
@@ -744,6 +765,7 @@ public class UserController {
 
     @PostMapping("/bind-unionid")
     @ApiOperation(value = "绑定微信 UnionId")
+    @SaCheckPermission("user:bindunionid")
     @XjrLog(value = "绑定微信 UnionId", saveResponseData = true)
     public R bindUnionId(@RequestBody BindOpenidDto dto) {
         User user = userService.getOne(Wrappers.<User>query().lambda().select(User::getId, User::getOpenId, User::getUnionId).eq(User::getId, dto.getId()), false);
@@ -780,6 +802,7 @@ public class UserController {
 
     @PostMapping("/bind-openid")
     @ApiOperation(value = "绑定微信 Openid")
+    @SaCheckPermission("user:bindopenid")
     @XjrLog(value = "绑定微信 Openid", saveResponseData = true)
     public RT<BindOpenidVo> bindOpenid(@RequestBody BindOpenidDto dto) {
         return RT.ok(userService.bindOpenid(dto));
@@ -787,6 +810,7 @@ public class UserController {
 
     @PostMapping("/unbind-openid")
     @ApiOperation(value = "取消绑定微信 UnionId")
+    @SaCheckPermission("user:unbindopenid")
     @XjrLog(value = "取消绑定微信 UnionId", saveResponseData = true)
     public R unbindOpenid(@RequestBody UnbindOpenidDto dto) {
         return R.ok(userService.unbindOpenid(dto));
@@ -794,6 +818,7 @@ public class UserController {
 
     @PostMapping("/register")
     @ApiOperation(value = "家长注册")
+    @SaCheckPermission("user:register")
     @XjrLog(value = "家长注册", saveResponseData = true)
     public R register(@Valid @RequestBody RegisterDto dto) {
         //验证家长手机号是否已经注册
@@ -833,6 +858,7 @@ public class UserController {
 
     @PostMapping("/bind-student")
     @ApiOperation(value = "绑定学生")
+    @SaCheckPermission("user:bindstudent")
     @XjrLog(value = "绑定学生", saveResponseData = true)
     public R bindStudent(@Valid @RequestBody UserStudentBindDto dto) {
         User user = userService.getOne(Wrappers.<User>query().lambda()
@@ -851,7 +877,9 @@ public class UserController {
     }
 
     @GetMapping(value = "/validate-student")
-    @XjrLog(value = "未知", saveResponseData = true)
+    @ApiOperation(value = "认证学生")
+    @SaCheckPermission("user:validatestudent")
+    @XjrLog(value = "认证学生", saveResponseData = true)
     public RT<UserStudentInfoVo> getValidateStudent(UserStudentBindDto dto) {
 
         UserStudentInfoVo userStudentInfoVo = baseStudentSchoolRollService.selectJoinOne(UserStudentInfoVo.class,
@@ -885,6 +913,7 @@ public class UserController {
 
     @DeleteMapping("/unbind-student")
     @ApiOperation(value = "解绑学生")
+    @SaCheckPermission("user:unbindstudent")
     @XjrLog(value = "解绑学生", saveResponseData = true)
     public R unBindStudent(@Valid @RequestBody UserStudentDeleteDto dto) {
         return R.ok(userStudentService.delete(dto));
@@ -892,6 +921,7 @@ public class UserController {
 
     @GetMapping("/student")
     @ApiOperation(value = "获取绑定学生")
+    @SaCheckPermission("user:student")
     @XjrLog(value = "获取绑定学生")
     public R unBindStudent(@Valid @RequestParam Long id) {
         return R.ok(baseClassService.getStudents(id));
@@ -899,6 +929,7 @@ public class UserController {
 
     @GetMapping("/user-student")
     @ApiOperation(value = "获取绑定学生")
+    @SaCheckPermission("user:userstudent")
     @XjrLog(value = "获取绑定学生")
     public RT<List<UserStudentVo>> getBindStudent(@Valid @RequestParam Long id) {
 
@@ -924,6 +955,7 @@ public class UserController {
 
     @PostMapping("/upload-sign")
     @ApiOperation(value = "上传签名")
+    @SaCheckPermission("user:uploadsign")
     @XjrLog(value = "上传签名", saveResponseData = true)
     public RT<Boolean> uploadSign(@Valid @RequestBody UploadSignDto dto) {
         long loginIdAsLong = StpUtil.getLoginIdAsLong();
@@ -936,6 +968,7 @@ public class UserController {
 
     @GetMapping("/getSign")
     @ApiOperation(value = "获取登录者的签名url")
+    @SaCheckPermission("user:getsign")
     @XjrLog(value = "获取登录者的签名url", saveResponseData = true)
     public RT<String> getSign() {
         long loginIdAsLong = StpUtil.getLoginIdAsLong();
@@ -952,6 +985,7 @@ public class UserController {
 
     @GetMapping("/check-password")
     @ApiOperation(value = "验证登录者的密码")
+    @SaCheckPermission("user:checkpassword")
     @XjrLog(value = "验证登录者的密码", saveRequestData = false, saveResponseData = true)
     public RT<Boolean> checkSignpassword(@RequestParam String password) {
         long loginIdAsLong = StpUtil.getLoginIdAsLong();
@@ -964,6 +998,7 @@ public class UserController {
 
     @PostMapping("/upload-mobile")
     @ApiOperation(value = "修改手机号")
+    @SaCheckPermission("user:uploadmobile")
     @XjrLog(value = "修改手机号", saveResponseData = true)
     public R uploadMobile(@Valid @RequestBody UploadMobileDto dto) {
         // 验证验证码

+ 5 - 0
src/main/java/com/xjrsoft/module/organization/controller/WechatController.java

@@ -1,6 +1,7 @@
 package com.xjrsoft.module.organization.controller;
 
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.xjrsoft.common.annotation.XjrLog;
 import com.xjrsoft.common.constant.GlobalConstant;
 import com.xjrsoft.common.model.result.R;
@@ -37,6 +38,7 @@ public class WechatController {
 
     @PutMapping("/sync-user")
     @ApiOperation(value = "微信信息更新")
+    @SaCheckPermission("wechat:syncuser")
     @XjrLog(value = "微信信息更新")
     public R updateInfo() {
 
@@ -53,6 +55,7 @@ public class WechatController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "获取员工分页信息")
+    @SaCheckPermission("wechat:page")
     @XjrLog(value = "获取员工分页信息")
     public R page(WeChatPageDto dto) {
         return R.ok(userService.getPage(dto));
@@ -60,6 +63,7 @@ public class WechatController {
 
     @GetMapping(value = "/departpage")
     @ApiOperation(value = "获取部门分页信息")
+    @SaCheckPermission("wechat:departpage")
     @XjrLog(value = "获取部门分页信息")
     public R page(WeChatDepartPageDto dto) {
         return R.ok(departmentService.Ipage(dto));
@@ -67,6 +71,7 @@ public class WechatController {
 
     @GetMapping(value = "/js-config")
     @ApiOperation(value = "前端jssdk页面配置需要用到的配置参数")
+    @SaCheckPermission("wechat:jsconfig")
     @XjrLog(value = "前端jssdk页面配置需要用到的配置参数")
     public R getWeixinJs(@RequestParam(value = "url", required = true) String url) throws Exception {
         return R.ok(WeChatService.getJsConfig(url));

+ 5 - 2
src/main/java/com/xjrsoft/module/oss/controller/OssController.java

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.oss.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.img.ImgUtil;
@@ -52,6 +53,7 @@ public class OssController {
      * 上传文件
      */
     @PostMapping("/upload")
+    @SaCheckPermission("oss:upload")
     @XjrLog(value = "上传文件")
     @SneakyThrows
     public R upload(@RequestParam("file") MultipartFile file, @RequestParam(value = "folderId", required = false) Long folderId,
@@ -128,10 +130,11 @@ public class OssController {
     }
 
     /**
-     * 上传文件
+     * 批量上传文件
      */
     @PostMapping("/multi-upload")
-    @XjrLog(value = "上传文件")
+    @SaCheckPermission("oss:multiupload")
+    @XjrLog(value = "批量上传文件")
     @SneakyThrows
     public R multiUpload(@RequestParam("file") MultipartFile[] file, @RequestParam(value = "folderId", required = false) Long folderId,
                          @RequestParam(value = "processId", required = false) String processId) {

+ 2 - 3
src/main/java/com/xjrsoft/module/outint/controller/CarOutInRecordController.java

@@ -45,7 +45,7 @@ public class CarOutInRecordController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "车辆出入记录列表(分页)")
-    @SaCheckPermission("caroutinrecord:detail")
+    @SaCheckPermission("caroutinrecord:page")
     @XjrLog(value = "车辆出入记录列表(分页)")
     public RT<PageOutput<CarOutInRecordPageVo>> page(@Valid CarOutInRecordPageDto dto) {
 
@@ -82,7 +82,7 @@ public class CarOutInRecordController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询车辆出入记录信息")
-    @SaCheckPermission("caroutinrecord:detail")
+    @SaCheckPermission("caroutinrecord:info")
     @XjrLog(value = "根据id查询车辆出入记录信息", saveResponseData = true)
     public RT<CarOutInRecordVo> info(@RequestParam Long id) {
         CarOutInRecord carOutInRecord = carOutInRecordService.getById(id);
@@ -92,7 +92,6 @@ public class CarOutInRecordController {
         return RT.ok(BeanUtil.toBean(carOutInRecord, CarOutInRecordVo.class));
     }
 
-
     @PostMapping
     @ApiOperation(value = "新增车辆出入记录")
     @SaCheckPermission("caroutinrecord:add")

+ 2 - 2
src/main/java/com/xjrsoft/module/outint/controller/StudentOutInRecordController.java

@@ -52,7 +52,7 @@ public class StudentOutInRecordController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "学生出入记录列表(分页)")
-    @SaCheckPermission("studentoutinrecord:detail")
+    @SaCheckPermission("studentoutinrecord:page")
     @XjrLog(value = "学生出入记录列表(分页)")
     public RT<PageOutput<StudentOutInRecordPageVo>> page(@Valid StudentOutInRecordPageDto dto) {
 
@@ -107,7 +107,7 @@ public class StudentOutInRecordController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询学生出入记录信息")
-    @SaCheckPermission("studentoutinrecord:detail")
+    @SaCheckPermission("studentoutinrecord:info")
     @XjrLog(value = "根据id查询学生出入记录信息", saveResponseData = true)
     public RT<StudentOutInRecordVo> info(@RequestParam Long id) {
         StudentOutInRecord studentOutInRecord = studentOutInRecordService.getById(id);

+ 3 - 3
src/main/java/com/xjrsoft/module/outint/controller/TeacherOutInRecordController.java

@@ -50,7 +50,7 @@ public class TeacherOutInRecordController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "教师出入记录列表(分页)")
-    @SaCheckPermission("teacheroutinrecord:detail")
+    @SaCheckPermission("teacheroutinrecord:page")
     @XjrLog(value = "教师出入记录列表(分页)")
     public RT<PageOutput<TeacherOutInRecordPageVo>> page(@Valid TeacherOutInRecordPageDto dto) {
         MPJLambdaWrapper<TeacherOutInRecord> queryWrapper = MPJWrappers.<TeacherOutInRecord>lambdaJoin()
@@ -80,7 +80,7 @@ public class TeacherOutInRecordController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询教师出入记录信息")
-    @SaCheckPermission("teacheroutinrecord:detail")
+    @SaCheckPermission("teacheroutinrecord:info")
     @XjrLog(value = "根据id查询教师出入记录信息")
     public RT<TeacherOutInRecordVo> info(@RequestParam Long id) {
         TeacherOutInRecord teacherOutInRecord = teacherOutInRecordService.getById(id);
@@ -122,7 +122,7 @@ public class TeacherOutInRecordController {
 
     @PostMapping("/sync-hikvision-data")
     @ApiOperation(value = "同步教师出入记录")
-    @SaCheckPermission("teacheroutinrecord:add")
+    @SaCheckPermission("teacheroutinrecord:synchikvisiondata")
     @XjrLog(value = "同步教师出入记录")
     public RT<Boolean> syncHikvisionData(@Valid @RequestBody SyncHikvsionDataDto dto) {
         return RT.ok(teacherOutInRecordService.syncHikvisionData(dto));

+ 2 - 2
src/main/java/com/xjrsoft/module/outint/controller/VisitorOutInRecordController.java

@@ -50,7 +50,7 @@ public class VisitorOutInRecordController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "访客出入记录列表(分页)")
-    @SaCheckPermission("visitoroutinrecord:detail")
+    @SaCheckPermission("visitoroutinrecord:page")
     @XjrLog(value = "访客出入记录列表(分页)")
     public RT<PageOutput<VisitorOutInRecordPageVo>> page(@Valid VisitorOutInRecordPageDto dto) {
         IPage<VisitorOutInRecordPageVo> page = visitorOutInRecordService.selectJoinListPage(ConventPage.getPage(dto), VisitorOutInRecordPageVo.class,
@@ -78,7 +78,7 @@ public class VisitorOutInRecordController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询访客出入记录信息")
-    @SaCheckPermission("visitoroutinrecord:detail")
+    @SaCheckPermission("visitoroutinrecord:info")
     @XjrLog(value = "根据id查询访客出入记录信息", saveResponseData = true)
     public RT<VisitorOutInRecordVo> info(@RequestParam Long id) {
         VisitorOutInRecord visitorOutInRecord = visitorOutInRecordService.getById(id);

+ 5 - 7
src/main/java/com/xjrsoft/module/personnel/controller/BasePersonnelLabourCapitalController.java

@@ -47,7 +47,7 @@ public class BasePersonnelLabourCapitalController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "工资发放列表(分页)")
-    @SaCheckPermission("basepersonnellabourcapital:detail")
+    @SaCheckPermission("basepersonnellabourcapital:page")
     @XjrLog(value = "工资发放列表(分页)")
     public RT<PageOutput<BasePersonnelLabourCapitalPageVo>> page(@Valid BasePersonnelLabourCapitalPageDto dto) {
 
@@ -63,7 +63,7 @@ public class BasePersonnelLabourCapitalController {
 
     @GetMapping(value = "/monthpage")
     @ApiOperation(value = "手机端月工资条发放列表(分页)")
-    @SaCheckPermission("basepersonnellabourcapital:detail")
+    @SaCheckPermission("basepersonnellabourcapital:monthpage")
     @XjrLog(value = "手机端月工资条发放列表(分页)")
     public RT<PageOutput<BasePersonnelLabourCapitalMonthPageVo>> monthPage(@Valid BasePersonnelLabourCapitalMonthPageDto dto) {
         Page<BasePersonnelLabourCapitalMonthPageVo> page = basePersonnelLabourCapitalService.getMonthPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
@@ -73,7 +73,7 @@ public class BasePersonnelLabourCapitalController {
 
     @GetMapping(value = "/yearpage")
     @ApiOperation(value = "手机端年工资条发放列表(分页)")
-    @SaCheckPermission("basepersonnellabourcapital:detail")
+    @SaCheckPermission("basepersonnellabourcapital:yearpage")
     @XjrLog(value = "手机端年工资条发放列表(分页)")
     public RT<PageOutput<BasePersonnelLabourCapitalYearPageVo>> yearPage(@Valid BasePersonnelLabourCapitalYearPageDto dto) {
         Page<BasePersonnelLabourCapitalYearPageVo> page = basePersonnelLabourCapitalService.getYearPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
@@ -83,7 +83,7 @@ public class BasePersonnelLabourCapitalController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询工资发放信息")
-    @SaCheckPermission("basepersonnellabourcapital:detail")
+    @SaCheckPermission("basepersonnellabourcapital:info")
     @XjrLog(value = "根据id查询工资发放信息", saveResponseData = true)
     public RT<BasePersonnelLabourCapitalVo> info(@RequestParam Long id) {
         BasePersonnelLabourCapital basePersonnelLabourCapital = basePersonnelLabourCapitalService.getByIdDeep(id);
@@ -93,7 +93,6 @@ public class BasePersonnelLabourCapitalController {
         return RT.ok(BeanUtil.toBean(basePersonnelLabourCapital, BasePersonnelLabourCapitalVo.class));
     }
 
-
     @PostMapping
     @ApiOperation(value = "新增工资发放")
     @SaCheckPermission("basepersonnellabourcapital:add")
@@ -109,10 +108,8 @@ public class BasePersonnelLabourCapitalController {
     @SaCheckPermission("basepersonnellabourcapital:edit")
     @XjrLog(value = "修改工资发放", saveResponseData = true)
     public RT<Boolean> update(@Valid @RequestBody UpdateBasePersonnelLabourCapitalDto dto) {
-
         BasePersonnelLabourCapital basePersonnelLabourCapital = BeanUtil.toBean(dto, BasePersonnelLabourCapital.class);
         return RT.ok(basePersonnelLabourCapitalService.update(basePersonnelLabourCapital));
-
     }
 
     @DeleteMapping
@@ -125,6 +122,7 @@ public class BasePersonnelLabourCapitalController {
 
     @PostMapping("/import")
     @ApiOperation(value = "导入")
+    @SaCheckPermission("basepersonnellabourcapital:import")
     @XjrLog(value = "导入", saveRequestData = false, saveResponseData = true)
     public RT<Boolean> importData(@Valid AddBasePersonnelLabourCapitalDto dto, @RequestParam("file") MultipartFile file) throws IOException, ParseException {
         if (dto.getCategory() == null) {

+ 6 - 6
src/main/java/com/xjrsoft/module/personnel/controller/CarManagementController.java

@@ -36,7 +36,7 @@ public class CarManagementController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "车辆列表(分页)")
-    @SaCheckPermission("carmanager:detail")
+    @SaCheckPermission("carmanagement:page")
     @XjrLog(value = "车辆列表(分页)")
     public RT<PageOutput<CarManagementVo>> Page(@Valid CarManagementPageDto dto) {
         MPJLambdaWrapper<CarManagement> queryWrapper = new MPJLambdaWrapper<>();
@@ -53,7 +53,7 @@ public class CarManagementController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询车辆信息")
-    @SaCheckPermission("carmanager:detail")
+    @SaCheckPermission("carmanagement:info")
     @XjrLog(value = "根据id查询车辆信息", saveResponseData = true)
     public RT<CarManagementVo> info(@RequestParam Long id) {
         CarManagement carManagement = carManagementService.getByIdDeep(id);
@@ -65,7 +65,7 @@ public class CarManagementController {
 
     @PostMapping
     @ApiOperation(value = "新增车辆")
-    @SaCheckPermission("carmanager:add")
+    @SaCheckPermission("carmanagement:add")
     @XjrLog(value = "新增车辆", saveResponseData = true)
     public RT<Boolean> add(@Valid @RequestBody AddCarManagementDto dto) {
         CarManagement carManagement = BeanUtil.toBean(dto, CarManagement.class);
@@ -75,7 +75,7 @@ public class CarManagementController {
 
     @PutMapping
     @ApiOperation(value = "修改车辆")
-    @SaCheckPermission("carmanager:edit")
+    @SaCheckPermission("carmanagement:edit")
     @XjrLog(value = "修改车辆", saveResponseData = true)
     public RT<Boolean> update(@Valid @RequestBody UpdateCarManagementDto dto) {
 
@@ -86,7 +86,7 @@ public class CarManagementController {
 
     @PutMapping("/status")
     @ApiOperation(value = "修改车辆状态")
-    @SaCheckPermission("carmanager:edit-status")
+    @SaCheckPermission("carmanagement:editstatus")
     @XjrLog(value = "修改车辆状态", saveResponseData = true)
     public RT<Boolean> updateEnabled(@Valid @RequestBody UpdateCarManagementStatusDto dto) {
         //根据id修改表单enabledMark
@@ -95,7 +95,7 @@ public class CarManagementController {
 
     @DeleteMapping
     @ApiOperation(value = "删除")
-    @SaCheckPermission("carmanager:delete")
+    @SaCheckPermission("carmanagement:delete")
     @XjrLog(value = "删除", saveResponseData = true)
     public RT<Boolean> delete(@Valid @RequestBody List<Long> ids) {
         return RT.ok(carManagementService.delete(ids));

+ 5 - 5
src/main/java/com/xjrsoft/module/personnel/controller/CarMessageApplyController.java

@@ -55,7 +55,7 @@ public class CarMessageApplyController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "车辆信息审核列表(分页)")
-    @SaCheckPermission("carmessageapply:detail")
+    @SaCheckPermission("carmessageapply:page")
     @XjrLog(value = "车辆信息审核列表(分页)")
     public RT<PageOutput<CarMessageApplyPageVo>> page(@Valid CarMessageApplyPageDto dto) {
 
@@ -84,7 +84,7 @@ public class CarMessageApplyController {
 
     @GetMapping(value = "/mobile-list")
     @ApiOperation(value = "我的车辆(列表)")
-    @SaCheckPermission("carmessageapply:detail")
+    @SaCheckPermission("carmessageapply:mobilelist")
     @XjrLog(value = "我的车辆(列表)")
     public RT<List<CarMessageApplyPageVo>> mobileList() {
         List<CarMessageApplyPageVo> list = carMessageApplyService.selectJoinList(CarMessageApplyPageVo.class,
@@ -99,7 +99,7 @@ public class CarMessageApplyController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询车辆信息审核信息")
-    @SaCheckPermission("carmessageapply:detail")
+    @SaCheckPermission("carmessageapply:info")
     @XjrLog(value = "根据id查询车辆信息审核信息", saveResponseData = true)
     public RT<CarMessageApplyVo> info(@RequestParam Long id) {
         CarMessageApply carMessageApply = carMessageApplyService.getById(id);
@@ -141,7 +141,7 @@ public class CarMessageApplyController {
 
     @PutMapping("/update-continue")
     @ApiOperation(value = "修改续期状态")
-    @SaCheckPermission("carmessageapply:update-continue")
+    @SaCheckPermission("carmessageapply:updatecontinue")
     @XjrLog(value = "修改续期状态", saveResponseData = true)
     public R updateContinue(@Valid @RequestBody UpdateEnableMarkDto dto) {
         CarMessageApply carMessageApply = new CarMessageApply();
@@ -153,7 +153,7 @@ public class CarMessageApplyController {
 
     @PostMapping("/update-end-time-batch")
     @ApiOperation(value = "批量修改有效期")
-    @SaCheckPermission("carmessageapply:add")
+    @SaCheckPermission("carmessageapply:updateendtimebatch")
     @XjrLog(value = "批量修改有效期", saveResponseData = true)
     public RT<Boolean> add(@Valid @RequestBody UpdateCarMessageApplyEndTimeDto dto) {
 

+ 1 - 1
src/main/java/com/xjrsoft/module/personnel/controller/CarParkRecordsController.java

@@ -33,7 +33,7 @@ public class CarParkRecordsController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "车辆进出记录(分页)")
-    @SaCheckPermission("carparkrecords:detail")
+    @SaCheckPermission("carparkrecords:page")
     @XjrLog(value = "车辆进出记录(分页)")
     public RT<PageOutput<CarParkRecordsVo>> Page(@Valid CarParkRecordsPageDto dto) {
         MPJLambdaWrapper<CarParkRecords> queryWrapper = new MPJLambdaWrapper<>();

+ 2 - 1
src/main/java/com/xjrsoft/module/personnel/controller/FaceIdentifyRecordsController.java

@@ -35,7 +35,7 @@ public class FaceIdentifyRecordsController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "人脸识别记录(分页)")
-    @SaCheckPermission("faceidentifyrecords:detail")
+    @SaCheckPermission("faceidentifyrecords:page")
     @XjrLog(value = "人脸识别记录(分页)")
     public RT<PageOutput<FaceIdentifyRecordsVo>> Page(@Valid FaceIdentifyRecordsPageDto dto) {
         MPJLambdaWrapper<FaceIdentifyRecords> queryWrapper = new MPJLambdaWrapper<>();
@@ -61,6 +61,7 @@ public class FaceIdentifyRecordsController {
 
     @GetMapping(value = "/user/page")
     @ApiOperation(value = "用户人脸识别记录(分页)")
+    @SaCheckPermission("faceidentifyrecords:userpage")
     @XjrLog(value = "用户人脸识别记录(分页)")
     public RT<PageOutput<FaceIdentifyRecordsVo>> userPage(@Valid FaceIdentifyRecordsPageUserDto dto) {
         if (dto.getUserId() == null) {

+ 10 - 12
src/main/java/com/xjrsoft/module/personnel/controller/FaceManagementController.java

@@ -54,7 +54,7 @@ public class FaceManagementController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "人脸列表(分页)")
-    @SaCheckPermission("facemanager:detail")
+    @SaCheckPermission("facemanagement:page")
     @XjrLog(value = "人脸列表(分页)")
     public RT<PageOutput<FaceManagementVo>> Page(@Valid FaceManagementPageDto dto) {
         MPJLambdaWrapper<FaceManagement> queryWrapper = new MPJLambdaWrapper<>();
@@ -71,7 +71,7 @@ public class FaceManagementController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询人脸信息")
-    @SaCheckPermission("facemanager:detail")
+    @SaCheckPermission("facemanagement:info")
     @XjrLog(value = "根据id查询人脸信息", saveResponseData = true)
     public RT<FaceManagementVo> info(@RequestParam Long id) {
         FaceManagement faceManagement = faceManagementService.getByIdDeep(id);
@@ -84,7 +84,7 @@ public class FaceManagementController {
 
     @GetMapping(value = "/detail")
     @ApiOperation(value = "根据当前用户查询人脸信息")
-    @SaCheckPermission("facemanager:detail")
+    @SaCheckPermission("facemanagement:detail")
     @XjrLog(value = "根据当前用户查询人脸信息", saveResponseData = true)
     public RT<FaceManagementVo> detail(Long id) {
         Long userId = StpUtil.getLoginIdAsLong();
@@ -147,7 +147,7 @@ public class FaceManagementController {
 
     @PostMapping(value = "/add")
     @ApiOperation(value = "新增人脸")
-    @SaCheckPermission("facemanager:add")
+    @SaCheckPermission("facemanagement:add")
     @XjrLog(value = "新增人脸", saveResponseData = true)
     public RT<Long> add(AddFaceManagementDto dto, @RequestParam("file") MultipartFile file) {
 
@@ -179,7 +179,7 @@ public class FaceManagementController {
 
     @PostMapping(value = "/update")
     @ApiOperation(value = "修改人脸")
-    @SaCheckPermission("facemanager:edit")
+    @SaCheckPermission("facemanagement:edit")
     @XjrLog(value = "修改人脸", saveResponseData = true)
     public RT<Long> update(UpdateFaceManagementDto dto, @RequestParam(name = "file", required = false) MultipartFile file) {
         String filename = file.getOriginalFilename();
@@ -208,7 +208,7 @@ public class FaceManagementController {
 
     @PutMapping("/status")
     @ApiOperation(value = "修改人脸状态")
-    @SaCheckPermission("facemanager:edit-status")
+    @SaCheckPermission("facemanagement:editstatus")
     @XjrLog(value = "修改人脸状态", saveResponseData = true)
     public RT<Boolean> updateEnabled(@Valid @RequestBody UpdateFaceManagementStatusDto dto) {
         //根据id修改表单enabledMark
@@ -217,19 +217,17 @@ public class FaceManagementController {
 
     @DeleteMapping
     @ApiOperation(value = "删除")
-    @SaCheckPermission("facemanager:delete")
+    @SaCheckPermission("facemanagement:delete")
     @XjrLog(value = "删除", saveResponseData = true)
     public RT<Boolean> delete(@Valid @RequestBody List<Long> ids) {
         return RT.ok(faceManagementService.delete(ids));
     }
 
     @DeleteMapping("/delete")
-    @ApiOperation(value = "删除")
-    @SaCheckPermission("facemanager:delete-current")
-    @XjrLog(value = "删除", saveResponseData = true)
+    @ApiOperation(value = "删除当前")
+    @SaCheckPermission("facemanagement:deletecurrent")
+    @XjrLog(value = "删除当前", saveResponseData = true)
     public RT<Boolean> delete() {
         return RT.ok(faceManagementService.remove(Wrappers.<FaceManagement>query().lambda().eq(FaceManagement::getUserId, StpUtil.getLoginIdAsLong())));
     }
-
-
 }

+ 2 - 1
src/main/java/com/xjrsoft/module/personnel/controller/LaborManagementController.java

@@ -40,7 +40,7 @@ public class LaborManagementController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "劳资管理列表(分页)")
-    @SaCheckPermission("baseteacher:detail")
+    @SaCheckPermission("labormanagement:page")
     @XjrLog(value = "劳资管理列表(分页)")
     public RT<PageOutput<LaborManagementPageVo>> page(@Valid LaborManagementPageDto dto) {
         Page<LaborManagementPageVo> page = laborManagementService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
@@ -50,6 +50,7 @@ public class LaborManagementController {
 
     @GetMapping("/export")
     @ApiOperation(value = "导出")
+    @SaCheckPermission("labormanagement:export")
     @XjrLog(value = "导出")
     public ResponseEntity<byte[]> exportData() {
         List<LaborManagementPageVo> list = laborManagementService.listLaborManagementPageVo();

+ 2 - 2
src/main/java/com/xjrsoft/module/personnel/controller/PersonnelHealthyController.java

@@ -43,7 +43,7 @@ public class PersonnelHealthyController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "人员健康信息表列表(分页)")
-    @SaCheckPermission("personnelhealthy:detail")
+    @SaCheckPermission("personnelhealthy:page")
     @XjrLog(value = "人员健康信息表列表(分页)")
     public RT<PageOutput<PersonnelHealthyPageVo>> page(@Valid PersonnelHealthyPageDto dto) {
 
@@ -64,7 +64,7 @@ public class PersonnelHealthyController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询人员健康信息表信息")
-    @SaCheckPermission("personnelhealthy:detail")
+    @SaCheckPermission("personnelhealthy:info")
     @XjrLog(value = "根据id查询人员健康信息表信息", saveResponseData = true)
     public RT<PersonnelHealthyVo> info(@RequestParam Long id) {
         PersonnelHealthy personnelHealthy = personnelHealthyService.getById(id);

+ 5 - 5
src/main/java/com/xjrsoft/module/personnel/controller/ReservationSchoolController.java

@@ -65,7 +65,7 @@ public class ReservationSchoolController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "预约进校列表(分页)")
-    @SaCheckPermission("reservationschool:detail")
+    @SaCheckPermission("reservationschool:page")
     @XjrLog(value = "预约进校列表(分页)")
     public RT<PageOutput<ReservationSchoolPageVo>> page(@Valid ReservationSchoolPageDto dto) {
 
@@ -116,7 +116,7 @@ public class ReservationSchoolController {
 
     @GetMapping(value = "/my-visitor-page")
     @ApiOperation(value = "我的访客(分页)")
-    @SaCheckPermission("reservationschool:detail")
+    @SaCheckPermission("reservationschool:myvisitorpage")
     @XjrLog(value = "我的访客(分页)")
     public RT<PageOutput<ReservationSchoolVisitorPageVo>> myVisitorPage(@Valid ReservationSchoolVisitorPageDto dto) {
         IPage<ReservationSchoolVisitorPageVo> page = reservationSchoolService.selectJoinListPage(ConventPage.getPage(dto),
@@ -140,7 +140,7 @@ public class ReservationSchoolController {
 
     @GetMapping(value = "/visitor-page")
     @ApiOperation(value = "访客记录(分页)")
-    @SaCheckPermission("reservationschool:detail")
+    @SaCheckPermission("reservationschool:visitorpage")
     @XjrLog(value = "访客记录(分页)")
     public RT<PageOutput<ReservationSchoolVisitorPageVo>> visitorPage(@Valid ReservationSchoolVisitorPageDto dto) {
         IPage<ReservationSchoolVisitorPageVo> page = reservationSchoolService.selectJoinListPage(ConventPage.getPage(dto),
@@ -169,7 +169,7 @@ public class ReservationSchoolController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询预约进校信息")
-    @SaCheckPermission("reservationschool:detail")
+    @SaCheckPermission("reservationschool:info")
     @XjrLog(value = "根据id查询预约进校信息", saveResponseData = true)
     public RT<ReservationSchoolVo> info(@RequestParam Long id) {
         ReservationSchool reservationSchool = reservationSchoolService.getByIdDeep(id);
@@ -212,7 +212,7 @@ public class ReservationSchoolController {
 
     @GetMapping(value = "/info-qrcode")
     @ApiOperation(value = "预约进校-生成二维码")
-    @SaCheckPermission("reservationschool:detail")
+    @SaCheckPermission("reservationschool:infoqrcode")
     @XjrLog(value = "预约进校-生成二维码")
     public RT<List<ReservationSchoolPeopleVo>> qrcode(@RequestParam Long id) throws Exception {
         ReservationSchool reservationSchool = reservationSchoolService.getByIdDeep(id);

+ 5 - 5
src/main/java/com/xjrsoft/module/personnel/controller/StundentFaceProcessController.java

@@ -87,7 +87,7 @@ public class StundentFaceProcessController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "学生人脸信息审核列表(分页)")
-    @SaCheckPermission("stundentfaceprocess:detail")
+    @SaCheckPermission("stundentfaceprocess:page")
     @XjrLog(value = "学生人脸信息审核列表(分页)")
     public RT<PageOutput<StundentFaceProcessPageVo>> page(@Valid StundentFaceProcessPageDto dto) {
 
@@ -124,7 +124,7 @@ public class StundentFaceProcessController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询学生人脸信息审核信息")
-    @SaCheckPermission("stundentfaceprocess:detail")
+    @SaCheckPermission("stundentfaceprocess:info")
     @XjrLog(value = "根据id查询学生人脸信息审核信息", saveResponseData = true)
     public RT<StundentFaceProcessVo> info(@RequestParam Long id) {
         StundentFaceProcess stundentFaceProcess = stundentFaceProcessService.getById(id);
@@ -136,7 +136,7 @@ public class StundentFaceProcessController {
 
     @GetMapping(value = "/info-userId")
     @ApiOperation(value = "根据用户id查询学生人脸信息审核信息")
-    @SaCheckPermission("stundentfaceprocess:detail")
+    @SaCheckPermission("stundentfaceprocess:infouserId")
     @XjrLog(value = "根据用户id查询学生人脸信息审核信息", saveResponseData = true)
     public RT<StundentFaceProcessVo> infoUserId(@RequestParam Long userId) {
         List<StundentFaceProcess> stundentFaceProcess = stundentFaceProcessService.list(
@@ -184,7 +184,7 @@ public class StundentFaceProcessController {
 
     @PostMapping(value = "/batch-import")
     @ApiOperation(value = "批量新增学生人脸")
-    @SaCheckPermission("stundentfaceprocess:batch-upload")
+    @SaCheckPermission("stundentfaceprocess:batchimport")
     @XjrLog(value = "批量新增学生人脸", saveResponseData = true)
     public RT<Boolean> batchUpload(@RequestParam("file") MultipartFile file) throws Exception {
         List<BaseStudentUser> list = studentManagerService.list(
@@ -427,7 +427,7 @@ public class StundentFaceProcessController {
 
     @PostMapping(value = "/ns-upload-face")
     @ApiOperation(value = "新生账号激活上传人脸信息")
-    @SaCheckPermission("stundentfaceprocess:add")
+    @SaCheckPermission("stundentfaceprocess:nsuploadface")
     @XjrLog(value = "新生账号激活上传人脸信息", saveResponseData = true)
     public RT<Boolean> nsUploadFace(AddFaceManagementDto dto, @RequestParam("file") MultipartFile file) {
         Boolean isSuccess = stundentFaceProcessService.nsUploadFace(dto, file);

+ 3 - 3
src/main/java/com/xjrsoft/module/personnel/controller/TeacherFaceProcessController.java

@@ -84,7 +84,7 @@ public class TeacherFaceProcessController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "人脸信息审核列表(分页)")
-    @SaCheckPermission("teacherfaceprocess:detail")
+    @SaCheckPermission("teacherfaceprocess:page")
     @XjrLog(value = "人脸信息审核列表(分页)")
     public RT<PageOutput<TeacherFaceProcessPageVo>> page(@Valid TeacherFaceProcessPageDto dto) {
 
@@ -120,7 +120,7 @@ public class TeacherFaceProcessController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询人脸信息审核信息")
-    @SaCheckPermission("teacherfaceprocess:detail")
+    @SaCheckPermission("teacherfaceprocess:info")
     @XjrLog(value = "根据id查询人脸信息审核信息", saveResponseData = true)
     public RT<TeacherFaceProcessVo> info(@RequestParam Long id) {
         TeacherFaceProcess teacherFaceProcess = teacherFaceProcessService.getById(id);
@@ -163,7 +163,7 @@ public class TeacherFaceProcessController {
 
     @PostMapping(value = "/batch-import")
     @ApiOperation(value = "批量新增教师人脸")
-    @SaCheckPermission("stundentfaceprocess:batch-upload")
+    @SaCheckPermission("stundentfaceprocess:batchimport")
     @XjrLog(value = "批量新增教师人脸", saveResponseData = true)
     public RT<Boolean> batchUpload(@RequestParam("file") MultipartFile file) throws Exception {
         List<User> list = userService.list(

+ 3 - 0
src/main/java/com/xjrsoft/module/print/controller/PrintConfigController.java

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.print.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.xjrsoft.common.annotation.XjrLog;
 import com.xjrsoft.common.constant.GlobalConstant;
 import com.xjrsoft.common.model.result.R;
@@ -31,6 +32,7 @@ public class PrintConfigController {
 
     @PostMapping
     @ApiOperation(value = "设置打印按钮配置")
+    @SaCheckPermission("printconfig:set")
     @XjrLog(value = "设置打印按钮配置", saveResponseData = true)
     public R set(@Valid @RequestBody PrintSetConfigDto dto) {
         return R.ok(printConfigService.setConfig(dto));
@@ -38,6 +40,7 @@ public class PrintConfigController {
 
     @GetMapping("/info")
     @ApiOperation(value = "获取打印按钮配置")
+    @SaCheckPermission("printconfig:info")
     @XjrLog(value = "获取打印按钮配置", saveResponseData = true)
     public R info(@Valid PrintConfigInfoDto dto) {
         return R.ok(printConfigService.getInfo(dto));

+ 8 - 0
src/main/java/com/xjrsoft/module/print/controller/PrintSchemaController.java

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.print.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -49,6 +50,7 @@ public class PrintSchemaController {
 
     @GetMapping(value = "/list")
     @ApiOperation(value = "打印模板不分页")
+    @SaCheckPermission("printschema:list")
     @XjrLog(value = "打印模板不分页")
     public R list(PrintSchemaListDto dto) {
 
@@ -67,6 +69,7 @@ public class PrintSchemaController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "打印模板分页")
+    @SaCheckPermission("printschema:page")
     @XjrLog(value = "打印模板分页")
     public R page(PrintSchemaPageDto dto) {
 
@@ -84,6 +87,7 @@ public class PrintSchemaController {
 
     @GetMapping("/info")
     @ApiOperation(value = "获取详情")
+    @SaCheckPermission("printschema:info")
     @XjrLog(value = "获取详情", saveResponseData = true)
     public R info(@RequestParam Long id) {
         PrintSchema schema = printSchemaService.getById(id);
@@ -105,6 +109,7 @@ public class PrintSchemaController {
 
     @PostMapping
     @ApiOperation(value = "新增")
+    @SaCheckPermission("printschema:add")
     @XjrLog(value = "新增", saveResponseData = true)
     public R add(@Valid @RequestBody AddPrintSchemaDto dto) {
 
@@ -114,6 +119,7 @@ public class PrintSchemaController {
 
     @PutMapping
     @ApiOperation(value = "修改")
+    @SaCheckPermission("printschema:edit")
     @XjrLog(value = "修改", saveResponseData = true)
     public R update(@Valid @RequestBody UpdatePrintSchemaDto dto) {
 
@@ -122,6 +128,7 @@ public class PrintSchemaController {
 
     @PutMapping("/enabled")
     @ApiOperation(value = "启用/禁用")
+    @SaCheckPermission("printschema:enabled")
     @XjrLog(value = "启用/禁用", saveResponseData = true)
     public R enabled(@Valid @RequestBody EnabledPrintSchemaDto dto) {
         PrintSchema schema = new PrintSchema();
@@ -134,6 +141,7 @@ public class PrintSchemaController {
 
     @DeleteMapping
     @ApiOperation(value = "删除")
+    @SaCheckPermission("printschema:delete")
     @XjrLog(value = "删除", saveResponseData = true)
     public R delete(@Valid @RequestBody List<Long> ids) {
         return R.ok(printSchemaService.removeByIds(ids));

+ 3 - 0
src/main/java/com/xjrsoft/module/prodOrder/controller/OrderController.java

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.prodOrder.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -41,6 +42,7 @@ public class OrderController {
 
     @PostMapping
     @ApiOperation(value = "新增订单")
+    @SaCheckPermission("order:add")
     @Transactional
     @XjrLog(value = "新增订单", saveResponseData = true)
     public R add(@RequestBody AddOrderDto dto) {
@@ -62,6 +64,7 @@ public class OrderController {
 
     @PutMapping
     @ApiOperation(value = "修改订单")
+    @SaCheckPermission("order:update")
     @XjrLog(value = "修改订单", saveResponseData = true)
     public R update(@RequestBody UpdateOrderDto dto) {
         String id = dto.getOrderID();

+ 6 - 0
src/main/java/com/xjrsoft/module/report/controller/ProfessionalReportController.java

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.report.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -37,6 +38,7 @@ public class ProfessionalReportController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "专业报表page接口")
+    @SaCheckPermission("professionalreport:page")
     @XjrLog(value = "专业报表树")
     public R page(ProfessionalReportPageDto dto) {
         List<ProfessionalReport> list = professionalReportService.list(Wrappers.<ProfessionalReport>query().lambda()
@@ -46,6 +48,7 @@ public class ProfessionalReportController {
 
     @PostMapping
     @ApiOperation(value = "新增专业报表")
+    @SaCheckPermission("professionalreport:add")
     @XjrLog(value = "新增专业报表", saveResponseData = true)
     public R add(@Valid @RequestBody AddProfessionalReportDto dto) {
         long count = professionalReportService.count(Wrappers.<ProfessionalReport>query().lambda().eq(ProfessionalReport::getName, dto.getName()));
@@ -59,6 +62,7 @@ public class ProfessionalReportController {
 
     @PutMapping
     @ApiOperation(value = "修改专业报表")
+    @SaCheckPermission("professionalreport:edit")
     @XjrLog(value = "修改专业报表", saveResponseData = true)
     public R update(@Valid @RequestBody UpdateProfessionalReportDto dto) {
         ProfessionalReport professionalReport = BeanUtil.toBean(dto, ProfessionalReport.class);
@@ -68,6 +72,7 @@ public class ProfessionalReportController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询专业报表信息")
+    @SaCheckPermission("professionalreport:info")
     @XjrLog(value = "根据id查询专业报表信息", saveResponseData = true)
     public R info(@RequestParam Long id) {
         ProfessionalReport professionalReport = professionalReportService.getById(id);
@@ -79,6 +84,7 @@ public class ProfessionalReportController {
 
     @DeleteMapping
     @ApiOperation(value = "删除专业报表")
+    @SaCheckPermission("professionalreport:delete")
     @XjrLog(value = "删除专业报表")
     public R delete(@Valid @RequestBody Long id) {
         return R.ok(professionalReportService.removeById(id));

+ 4 - 0
src/main/java/com/xjrsoft/module/report/controller/ReportController.java

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.report.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -46,6 +47,7 @@ public class ReportController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "ureport 报表列表(分页)")
+    @SaCheckPermission("report:page")
     @XjrLog(value = "ureport 报表列表(分页)")
     public R page(@Valid ReportPageDto dto) {
         LambdaQueryWrapper<Report> queryWrapper = new LambdaQueryWrapper<>();
@@ -60,6 +62,7 @@ public class ReportController {
 
     @GetMapping(value = "/list")
     @ApiOperation(value = "ureport 报表列表(不分页)")
+    @SaCheckPermission("report:list")
     @XjrLog(value = "ureport 报表列表(不分页)")
     public R list(@Valid ReportListDto dto) {
         LambdaQueryWrapper<Report> queryWrapper = new LambdaQueryWrapper<>();
@@ -87,6 +90,7 @@ public class ReportController {
 
     @DeleteMapping
     @ApiOperation(value = "删除")
+    @SaCheckPermission("report:delete")
     @XjrLog(value = "删除", saveResponseData = true)
     public R delete(@Valid @RequestBody List<Long> ids) {
         return R.ok(reportService.removeBatchByIds(ids));

+ 6 - 0
src/main/java/com/xjrsoft/module/report/controller/ReportReleaseController.java

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.report.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.xjrsoft.common.annotation.XjrLog;
 import com.xjrsoft.common.constant.GlobalConstant;
 import com.xjrsoft.common.model.result.R;
@@ -33,6 +34,7 @@ public class ReportReleaseController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "报表发布列表(分页)")
+    @SaCheckPermission("reportrelease:page")
     @XjrLog(value = "报表发布列表(分页)")
     public R page(@Valid ReportReleasePageDto dto) {
         return R.ok(reportRelationService.releasePage(dto));
@@ -40,6 +42,7 @@ public class ReportReleaseController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "报表发布详情")
+    @SaCheckPermission("reportrelease:info")
     @XjrLog(value = "报表发布详情", saveResponseData = true)
     public R info(@RequestParam Long id) {
         return R.ok(reportRelationService.info(id));
@@ -47,6 +50,7 @@ public class ReportReleaseController {
 
     @PostMapping
     @ApiOperation(value = "新增(分页)")
+    @SaCheckPermission("reportrelease:add")
     @XjrLog(value = "新增(分页)")
     public R add(@Valid @RequestBody AddReportReleaseDto dto) {
         return R.ok(reportRelationService.add(dto));
@@ -54,6 +58,7 @@ public class ReportReleaseController {
 
     @PutMapping
     @ApiOperation(value = "修改(分页)")
+    @SaCheckPermission("reportrelease:update")
     @XjrLog(value = "修改(分页)")
     public R update(@Valid @RequestBody UpdateReportReleaseDto dto) {
         return R.ok(reportRelationService.update(dto));
@@ -61,6 +66,7 @@ public class ReportReleaseController {
 
     @DeleteMapping
     @ApiOperation(value = "删除")
+    @SaCheckPermission("reportrelease:delete")
     @XjrLog(value = "删除")
     public R delete(@Valid @RequestBody List<Long> ids) {
         return R.ok(reportRelationService.removeBatchByIds(ids));

+ 1 - 1
src/main/java/com/xjrsoft/module/room/controller/DistributeRoomBedController.java

@@ -35,7 +35,7 @@ public class DistributeRoomBedController {
 
     @PutMapping
     @ApiOperation(value = "修改寝室床位")
-    @SaCheckPermission("roombed:edit")
+    @SaCheckPermission("distributeroombed:edit")
     @XjrLog(value = "修改寝室床位", saveResponseData = true)
     public RT<List<DistributeResultClassVo>> distributeRoomBed(@Valid @RequestBody DistributeRoomBedDto dto) {
         Boolean result = roomBedService.distributeRoomBed(dto);

+ 7 - 7
src/main/java/com/xjrsoft/module/room/controller/RoomBedAdjustController.java

@@ -47,7 +47,7 @@ public class RoomBedAdjustController {
 
     @GetMapping(value = "/class-student")
     @ApiOperation(value = "需要分配/调整床位的学生")
-    @SaCheckPermission("roomBedAdjust:detail")
+    @SaCheckPermission("roomBedAdjust:classstudent")
     @XjrLog(value = "需要分配/调整床位的学生")
     public RT<List<AdjustBedClassPageVo>> classStudent(@Valid AdjustClassPageDto dto) {
         List<String> roleList = StpUtil.getRoleList();
@@ -77,7 +77,7 @@ public class RoomBedAdjustController {
 
     @GetMapping(value = "/bed-student")
     @ApiOperation(value = "床位学生列表")
-    @SaCheckPermission("roomBedAdjust:detail")
+    @SaCheckPermission("roomBedAdjust:bedstudent")
     @XjrLog(value = "床位学生列表")
     public RT<List<AdjustBedStudentPageVo>> distributeClassPage(@Valid AdjustBedPageDto dto) {
         List<String> roleList = StpUtil.getRoleList();
@@ -103,7 +103,7 @@ public class RoomBedAdjustController {
 
     @GetMapping(value = "/is-class-teacher")
     @ApiOperation(value = "判断登录者是否是班主任")
-    @SaCheckPermission("roomBedAdjust:detail")
+    @SaCheckPermission("roomBedAdjust:isclassteacher")
     @XjrLog(value = "判断登录者是否是班主任", saveResponseData = true)
     public RT<Integer> getLoginRole(@Valid AdjustBedPageDto dto) {
         List<String> roleList = StpUtil.getRoleList();
@@ -116,7 +116,7 @@ public class RoomBedAdjustController {
 
     @GetMapping(value = "/no-bed-student")
     @ApiOperation(value = "未分配床位的学生(分页)")
-    @SaCheckPermission("roomBedAdjust:detail")
+    @SaCheckPermission("roomBedAdjust:nobedstudent")
     @XjrLog(value = "未分配床位的学生(分页)")
     public RT<PageOutput<NoBedStudentPageVo>> noBedStudent(@Valid AdjustBedPageDto dto) {
         Page<NoBedStudentPageVo> page = roomBedService.getNoBedStudent(new Page<>(dto.getLimit(), dto.getSize()), dto);
@@ -135,7 +135,7 @@ public class RoomBedAdjustController {
 
     @DeleteMapping(value = "/delete-one")
     @ApiOperation(value = "单个移出学生")
-    @SaCheckPermission("roomBedAdjust:delete")
+    @SaCheckPermission("roomBedAdjust:deleteone")
     @XjrLog(value = "单个移出学生", saveResponseData = true)
     public RT<Boolean> deleteOne(@Valid @RequestBody Long id) {
         return RT.ok(roomBedService.clearStudentInfoByBedId(id));
@@ -152,7 +152,7 @@ public class RoomBedAdjustController {
 
     @PutMapping("/adjustBedBatch")
     @ApiOperation(value = "批量修改学生的寝室床位")
-    @SaCheckPermission("roomBedAdjust:edit")
+    @SaCheckPermission("roomBedAdjust:adjustbedbatch")
     @XjrLog(value = "批量修改学生的寝室床位", saveResponseData = true)
     public RT<Boolean> adjustBedBatch(@Valid @RequestBody List<AdjustStudentBedDto> dto) {
         Boolean result = roomBedService.adjustBedBatch(dto);
@@ -161,7 +161,7 @@ public class RoomBedAdjustController {
 
     @GetMapping("/teacher-room-list")
     @ApiOperation(value = "班主任查看寝室")
-    @SaCheckPermission("roomBedAdjust:edit")
+    @SaCheckPermission("roomBedAdjust:teacherroomlist")
     @XjrLog(value = "班主任查看寝室")
     public RT<List<TeacherRoomListVo>> roomList(@Valid AdjustBedPageDto dto) {
         List<String> roleList = StpUtil.getRoleList();

+ 5 - 4
src/main/java/com/xjrsoft/module/room/controller/RoomBedCheckRecordController.java

@@ -45,7 +45,7 @@ public class RoomBedCheckRecordController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "查寝记录列表(分页)")
-    @SaCheckPermission("roombedcheckrecord:detail")
+    @SaCheckPermission("roombedcheckrecord:page")
     @XjrLog(value = "查寝记录列表(分页)")
     public RT<PageOutput<RoomBedCheckRecordPageVo>> page(@Valid RoomBedCheckRecordPageDto dto) {
         IPage<RoomBedCheckRecordPageVo> page = roomBedCheckRecordService.getPage(dto);
@@ -55,7 +55,7 @@ public class RoomBedCheckRecordController {
 
     @GetMapping(value = "/page-mobile")
     @ApiOperation(value = "查寝记录列表(分页-移动)")
-    @SaCheckPermission("roombedcheckrecord:detail")
+    @SaCheckPermission("roombedcheckrecord:pagemobile")
     @XjrLog(value = "查寝记录列表(分页-移动)")
     public RT<PageOutput<RoomBedCheckRecordPageVo>> pageMobile(@Valid RoomBedCheckRecordPageDto dto) {
         IPage<RoomBedCheckRecordPageVo> page = roomBedCheckRecordService.getPageMobile(dto);
@@ -65,7 +65,7 @@ public class RoomBedCheckRecordController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询查寝记录信息")
-    @SaCheckPermission("roombedcheckrecord:detail")
+    @SaCheckPermission("roombedcheckrecord:info")
     @XjrLog(value = "根据id查询查寝记录信息", saveResponseData = true)
     public RT<RoomBedCheckRecordVo> info(@RequestParam Long id) {
         RoomBedCheckRecordVo roomBedCheckRecordVo = roomBedCheckRecordService.getInfo(id);
@@ -78,7 +78,7 @@ public class RoomBedCheckRecordController {
 
     @GetMapping(value = "/echo")
     @ApiOperation(value = "查寝记录回显")
-    @SaCheckPermission("roombedcheckrecord:detail")
+    @SaCheckPermission("roombedcheckrecord:echo")
     @XjrLog(value = "查寝记录回显", saveResponseData = true)
     public RT<RoomBedCheckRecordEchoVo> echo() {
         RoomBedCheckRecordEchoVo roomBedCheckRecordEchoVo = roomBedCheckRecordService.getEcho();
@@ -117,6 +117,7 @@ public class RoomBedCheckRecordController {
 
     @GetMapping("/export")
     @ApiOperation(value = "导出")
+    @SaCheckPermission("roombedcheckrecord:export")
     @XjrLog(value = "导出")
     public ResponseEntity<byte[]> exportData(@Valid RoomBedCheckRecordPageDto dto, @RequestParam(defaultValue = "false") Boolean isTemplate) {
         List<RoomBedCheckRecordPageVo> customerList = isTemplate != null && isTemplate ? new ArrayList<>() : page(dto).getData().getList();

+ 6 - 4
src/main/java/com/xjrsoft/module/room/controller/RoomBedController.java

@@ -42,7 +42,7 @@ public class RoomBedController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "寝室床位列表(分页)")
-    @SaCheckPermission("roombed:detail")
+    @SaCheckPermission("roombed:page")
     @XjrLog(value = "寝室床位列表(分页)")
     public RT<PageOutput<RoomBedPageVo>> page(@Valid RoomBedPageDto dto) {
 
@@ -53,7 +53,7 @@ public class RoomBedController {
 
     @GetMapping(value = "/distribute-class-page")
     @ApiOperation(value = "分配床位班级列表(分页)")
-    @SaCheckPermission("roombed:detail")
+    @SaCheckPermission("roombed:distributeclasspage")
     @XjrLog(value = "分配床位班级列表(分页)")
     public RT<PageOutput<DistributeClassPageVo>> distributeClassPage(@Valid DistributeClassPageDto dto) {
         Page<DistributeClassPageVo> page = roomBedService.getDistributeClassInfo(new Page<>(dto.getLimit(), dto.getSize()), dto);
@@ -63,7 +63,7 @@ public class RoomBedController {
 
     @GetMapping(value = "/distribute-roombed-page")
     @ApiOperation(value = "分配床位寝室床位列表(分页)")
-    @SaCheckPermission("roombed:detail")
+    @SaCheckPermission("roombed:distributeroombedpage")
     @XjrLog(value = "分配床位寝室床位列表(分页)")
     public RT<PageOutput<DistributeRoomBedPageVo>> distributeRoomBedPage(@Valid DistributeRoomBedPageDto dto) {
         Page<DistributeRoomBedPageVo> page = roomBedService.getDistributeRoomBedInfo(new Page<>(dto.getLimit(), dto.getSize()), dto);
@@ -73,7 +73,7 @@ public class RoomBedController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询寝室床位信息")
-    @SaCheckPermission("roombed:detail")
+    @SaCheckPermission("roombed:info")
     @XjrLog(value = "根据id查询寝室床位信息", saveResponseData = true)
     public RT<RoomBedVo> info(@RequestParam Long id) {
         RoomBed roomBed = roomBedService.getById(id);
@@ -115,6 +115,7 @@ public class RoomBedController {
 
     @PostMapping("/import")
     @ApiOperation(value = "导入")
+    @SaCheckPermission("roombed:import")
     @XjrLog(value = "导入", saveRequestData = false, saveResponseData = true)
     public RT<Boolean> importData(@RequestParam MultipartFile file) throws IOException {
         List<RoomBedPageVo> savedDataList = EasyExcel.read(file.getInputStream()).head(RoomBedPageVo.class).sheet().doReadSync();
@@ -124,6 +125,7 @@ public class RoomBedController {
 
     @GetMapping("/export")
     @ApiOperation(value = "导出")
+    @SaCheckPermission("roombed:export")
     @XjrLog(value = "导出")
     public ResponseEntity<byte[]> exportData(@Valid RoomBedPageDto dto, @RequestParam(defaultValue = "false") Boolean isTemplate) {
         List<RoomBedExcelVo> customerList = roomBedService.getList(dto);

+ 4 - 2
src/main/java/com/xjrsoft/module/room/controller/RoomController.java

@@ -46,7 +46,7 @@ public class RoomController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "寝室列表(分页)")
-    @SaCheckPermission("room:detail")
+    @SaCheckPermission("room:page")
     @XjrLog(value = "寝室列表(分页)")
     public RT<PageOutput<RoomPageVo>> page(@Valid RoomPageDto dto) {
 
@@ -57,7 +57,7 @@ public class RoomController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询寝室信息")
-    @SaCheckPermission("room:detail")
+    @SaCheckPermission("room:info")
     @XjrLog(value = "根据id查询寝室信息", saveResponseData = true)
     public RT<RoomVo> info(@RequestParam Long id) {
         Room room = roomService.getById(id);
@@ -106,6 +106,7 @@ public class RoomController {
 
     @PostMapping("/import")
     @ApiOperation(value = "导入")
+    @SaCheckPermission("room:import")
     @XjrLog(value = "导入", saveRequestData = false, saveResponseData = true)
     public RT<Boolean> importData(@RequestParam MultipartFile file) throws IOException {
         List<RoomPageVo> savedDataList = EasyExcel.read(file.getInputStream()).head(RoomPageVo.class).sheet().doReadSync();
@@ -115,6 +116,7 @@ public class RoomController {
 
     @GetMapping("/export")
     @ApiOperation(value = "导出")
+    @SaCheckPermission("room:export")
     @XjrLog(value = "导出")
     public ResponseEntity<byte[]> exportData(@Valid RoomPageDto dto, @RequestParam(defaultValue = "false") Boolean isTemplate) {
         List<RoomExcelVo> customerList = roomService.getList(dto);

+ 3 - 3
src/main/java/com/xjrsoft/module/room/controller/RoomRuleController.java

@@ -40,7 +40,7 @@ public class RoomRuleController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "寝室生成规则列表(分页)")
-    @SaCheckPermission("roomrule:detail")
+    @SaCheckPermission("roomrule:page")
     @XjrLog(value = "寝室生成规则列表(分页)")
     public RT<PageOutput<RoomRulePageVo>> page(@Valid RoomRulePageDto dto) {
         Page<RoomRulePageVo> page = roomRuleService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
@@ -50,7 +50,7 @@ public class RoomRuleController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询寝室生成规则信息")
-    @SaCheckPermission("roomrule:detail")
+    @SaCheckPermission("roomrule:info")
     @XjrLog(value = "根据id查询寝室生成规则信息", saveResponseData = true)
     public RT<RoomRuleVo> info(@RequestParam Long id) {
         RoomRule roomRule = roomRuleService.getByIdDeep(id);
@@ -91,7 +91,7 @@ public class RoomRuleController {
 
     @PostMapping(value = "/bind-builds")
     @ApiOperation(value = "绑定楼栋")
-    @SaCheckPermission("roomrule:edit")
+    @SaCheckPermission("roomrule:bindbuilds")
     @XjrLog(value = "绑定楼栋", saveResponseData = true)
     public RT<Boolean> bindBuilds(@Valid @RequestBody AddRoomRuleItemDto dto) {
         return RT.ok(roomRuleService.bindBuilds(dto));

+ 4 - 4
src/main/java/com/xjrsoft/module/room/controller/RoomStudentAppointController.java

@@ -42,7 +42,7 @@ public class RoomStudentAppointController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "寝室干部任命列表(分页)")
-    @SaCheckPermission("roomstudentappoint:detail")
+    @SaCheckPermission("roomstudentappoint:page")
     @XjrLog(value = "寝室干部任命列表(分页)")
     public RT<PageOutput<HeadTeaRoomCadreAppointPageVo>> page(@Valid RoomStudentAppointPageDto dto) {
 
@@ -53,7 +53,7 @@ public class RoomStudentAppointController {
 
     @GetMapping(value = "/getStuByRoomId")
     @ApiOperation(value = "根据寝室id获取该寝室的所有已入住人员(不分页)")
-    @SaCheckPermission("roomstudentappoint:detail")
+    @SaCheckPermission("roomstudentappoint:getstubyroomid")
     @XjrLog(value = "根据寝室id获取该寝室的所有已入住人员(不分页)")
     public RT<List<AppointPageRoomBedVo>> getStuByRoomId(@Valid RoomStudentAppointPageDto dto) {
         List<AppointPageRoomBedVo> appointPageRoomBedVoList = roomStudentAppointService.getStuByRoomId(dto);
@@ -62,7 +62,7 @@ public class RoomStudentAppointController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询寝室干部信息")
-    @SaCheckPermission("roomstudentappoint:detail")
+    @SaCheckPermission("roomstudentappoint:info")
     @XjrLog(value = "根据id查询寝室干部信息", saveResponseData = true)
     public RT<RoomStudentAppointVo> info(@RequestParam Long id) {
         RoomStudentAppoint roomStudentAppoint = roomStudentAppointService.getById(id);
@@ -96,7 +96,7 @@ public class RoomStudentAppointController {
 
     @PutMapping("/appoint")
     @ApiOperation(value = "任命寝室干部,寝室干部记录中存在更新,不存在新增")
-    @SaCheckPermission("roomstudentappoint:edit")
+    @SaCheckPermission("roomstudentappoint:appoint")
     @XjrLog(value = "任命寝室干部,寝室干部记录中存在更新,不存在新增", saveResponseData = true)
     public RT<Boolean> appoint(@Valid @RequestBody UpdateRoomStudentAppointDto dto) {
         LambdaQueryWrapper<RoomStudentAppoint> queryWrapper = new LambdaQueryWrapper<>();

+ 2 - 2
src/main/java/com/xjrsoft/module/room/controller/RoomTeacherAppointController.java

@@ -38,7 +38,7 @@ public class RoomTeacherAppointController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "宿管任命列表(分页)")
-    @SaCheckPermission("roomteacherappoint:detail")
+    @SaCheckPermission("roomteacherappoint:page")
     @XjrLog(value = "宿管任命列表(分页)")
     public RT<PageOutput<RoomTeacherAppointPageVo>> page(@Valid RoomTeacherAppointPageDto dto) {
 
@@ -49,7 +49,7 @@ public class RoomTeacherAppointController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询宿管任命信息")
-    @SaCheckPermission("roomteacherappoint:detail")
+    @SaCheckPermission("roomteacherappoint:info")
     @XjrLog(value = "根据id查询宿管任命信息", saveResponseData = true)
     public RT<RoomTeacherAppointVo> info(@RequestParam Long id) {
         RoomTeacherAppoint roomTeacherAppoint = roomTeacherAppointService.getById(id);

+ 3 - 2
src/main/java/com/xjrsoft/module/room/controller/RoomValueWeekController.java

@@ -55,7 +55,7 @@ public class RoomValueWeekController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "宿管值班管理列表(分页)")
-    @SaCheckPermission("roomvalueweek:detail")
+    @SaCheckPermission("roomvalueweek:page")
     @XjrLog(value = "宿管值班管理列表(分页)")
     public RT<PageOutput<RoomValueWeekPageVo>> page(@Valid RoomValueWeekPageDto dto) {
         roomValueWeekService.updateNumberPeople();
@@ -66,7 +66,7 @@ public class RoomValueWeekController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询宿管值班管理信息")
-    @SaCheckPermission("roomvalueweek:detail")
+    @SaCheckPermission("roomvalueweek:info")
     @XjrLog(value = "根据id查询宿管值班管理信息", saveResponseData = true)
     public RT<RoomValueWeekItemVo> info(@RequestParam Long id) {
         RoomValueWeekItemVo roomValueWeek = roomValueWeekService.getItemInfo(id);
@@ -107,6 +107,7 @@ public class RoomValueWeekController {
 
     @GetMapping("/export")
     @ApiOperation(value = "导出")
+    @SaCheckPermission("roomvalueweek:export")
     @XjrLog(value = "导出")
     public ResponseEntity<byte[]> exportData(@Valid RoomValueWeekPageDto dto, @RequestParam(defaultValue = "false") Boolean isTemplate) throws IOException {
         List<RoomValueWeekExcelVo> dataList = roomValueWeekService.getList(dto);

+ 3 - 2
src/main/java/com/xjrsoft/module/room/controller/WfRoomApplicantController.java

@@ -46,7 +46,7 @@ public class WfRoomApplicantController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "寝室申请列表(分页)")
-    @SaCheckPermission("wfroomapplicant:detail")
+    @SaCheckPermission("wfroomapplicant:page")
     @XjrLog(value = "寝室申请列表(分页)")
     public RT<PageOutput<WfRoomApplicantPageVo>> page(@Valid WfRoomApplicantPageDto dto) {
 
@@ -61,7 +61,7 @@ public class WfRoomApplicantController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询寝室申请信息")
-    @SaCheckPermission("wfroomapplicant:detail")
+    @SaCheckPermission("wfroomapplicant:info")
     @XjrLog(value = "根据id查询寝室申请信息", saveResponseData = true)
     public RT<WfRoomApplicantVo> info(@RequestParam Long id) {
         WfRoomApplicant wfRoomApplicant = wfRoomApplicantService.getById(id);
@@ -104,6 +104,7 @@ public class WfRoomApplicantController {
 
     @GetMapping("/export")
     @ApiOperation(value = "导出")
+    @SaCheckPermission("wfroomapplicant:export")
     @XjrLog(value = "导出")
     public ResponseEntity<byte[]> exportData(@Valid WfRoomApplicantPageDto dto, @RequestParam(defaultValue = "false") Boolean isTemplate) {
         List<WfRoomApplicantPageVo> customerList = isTemplate != null && isTemplate ? new ArrayList<>() : page(dto).getData().getList();

+ 3 - 2
src/main/java/com/xjrsoft/module/room/controller/WfRoomReportController.java

@@ -51,7 +51,7 @@ public class WfRoomReportController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "寝室情况汇报列表(分页)")
-    @SaCheckPermission("wfroomreport:detail")
+    @SaCheckPermission("wfroomreport:page")
     @XjrLog(value = "寝室情况汇报列表(分页)")
     public RT<PageOutput<WfRoomReportPageVo>> page(@Valid WfRoomReportPageDto dto) {
 
@@ -72,7 +72,7 @@ public class WfRoomReportController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询寝室情况汇报信息")
-    @SaCheckPermission("wfroomreport:detail")
+    @SaCheckPermission("wfroomreport:info")
     @XjrLog(value = "根据id查询寝室情况汇报信息", saveResponseData = true)
     public RT<WfRoomReportVo> info(@RequestParam Long id) {
         MPJLambdaWrapper<WfRoomReport> queryWrapper = new MPJLambdaWrapper<>();
@@ -130,6 +130,7 @@ public class WfRoomReportController {
 
     @GetMapping("/export")
     @ApiOperation(value = "导出")
+    @SaCheckPermission("wfroomreport:export")
     @XjrLog(value = "导出")
     public ResponseEntity<byte[]> exportData(@Valid WfRoomReportPageDto dto, @RequestParam(defaultValue = "false") Boolean isTemplate) {
         List<WfRoomReportPageVo> customerList = isTemplate != null && isTemplate ? new ArrayList<>() : page(dto).getData().getList();

+ 3 - 2
src/main/java/com/xjrsoft/module/room/controller/WfRoomStayOvernightController.java

@@ -48,7 +48,7 @@ public class WfRoomStayOvernightController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "留校住宿申请列表(分页)")
-    @SaCheckPermission("wfroomstayovernight:detail")
+    @SaCheckPermission("wfroomstayovernight:page")
     @XjrLog(value = "留校住宿申请列表(分页)")
     public RT<PageOutput<WfRoomStayOvernightPageVo>> page(@Valid WfRoomStayOvernightPageDto dto) {
         MPJLambdaWrapper<WfRoomStayOvernight> queryWrapper = new MPJLambdaWrapper<>();
@@ -74,7 +74,7 @@ public class WfRoomStayOvernightController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询留校住宿申请信息")
-    @SaCheckPermission("wfroomstayovernight:detail")
+    @SaCheckPermission("wfroomstayovernight:info")
     @XjrLog(value = "根据id查询留校住宿申请信息", saveResponseData = true)
     public RT<WfRoomStayOvernightVo> info(@RequestParam Long id) {
         WfRoomStayOvernight wfRoomStayOvernight = wfRoomStayOvernightService.getById(id);
@@ -117,6 +117,7 @@ public class WfRoomStayOvernightController {
 
     @PostMapping("/export-query")
     @ApiOperation(value = "导出")
+    @SaCheckPermission("wfroomstayovernight:exportquery")
     @XjrLog(value = "导出")
     public ResponseEntity<byte[]> exportData(@Valid @RequestBody WfRoomStayOvernightPageDto dto) {
         MPJLambdaWrapper<WfRoomStayOvernight> queryWrapper = new MPJLambdaWrapper<>();

+ 15 - 14
src/main/java/com/xjrsoft/module/schedule/controller/ScheduleController.java

@@ -83,7 +83,7 @@ public class ScheduleController {
 
     @GetMapping(value = "/receive-msg")
     @ApiOperation(value = "接收消息")
-    @SaCheckPermission("schedule:detail")
+    @SaCheckPermission("schedule:receivemsg")
     @XjrLog(value = "接收消息", saveResponseData = true)
     public RT<CourseReceiveMsg> receiveMsg(@RequestParam String schoolId, @RequestParam String eduYearSerialNo, @RequestParam String startDate, @RequestParam String endDate) throws Exception {
         Date date = new Date();
@@ -104,7 +104,7 @@ public class ScheduleController {
 
     @GetMapping(value = "/course-table")
     @ApiOperation(value = "课表接口(PC端)")
-    @SaCheckPermission("schedule:detail")
+    @SaCheckPermission("schedule:coursetable")
     @XjrLog(value = "课表接口(PC端)", saveRequestData = false)
     public RT<CourseTableVo> courseInfo(CourseTableDto dto) {
         if (dto.getSemesterId() == null) {
@@ -119,7 +119,7 @@ public class ScheduleController {
 
     @GetMapping(value = "/course-table-day")
     @ApiOperation(value = "今日课表接口(手机端)")
-    @SaCheckPermission("schedule:detail")
+    @SaCheckPermission("schedule:coursetableday")
     @XjrLog(value = "今日课表接口(手机端)", saveResponseData = true)
     public RT<CourseTableVo> courseInfoDay(CourseTableDto dto) {
         LocalDateTime now = LocalDateTime.now();
@@ -157,7 +157,7 @@ public class ScheduleController {
 
     @GetMapping(value = "/current-week")
     @ApiOperation(value = "获取当前周次")
-    @SaCheckPermission("schedule:detail")
+    @SaCheckPermission("schedule:currentweek")
     @XjrLog(value = "获取当前周次", saveResponseData = true)
     public RT<Integer> currentWeek(CourseTableDto dto) {
         CurrentWeekVo currentWeek = courseTableService.getCurrentWeek(dto);
@@ -170,7 +170,7 @@ public class ScheduleController {
 
     @GetMapping(value = "/adjust-list")
     @ApiOperation(value = "可以调课的课程")
-    @SaCheckPermission("schedule:detail")
+    @SaCheckPermission("schedule:adjustlist")
     @XjrLog(value = "可以调课的课程")
     public RT<List<CourseListVo>> adjustList(CourseTableAdjustDto dto) {
         if (dto.getAdjustDate() == null || dto.getTeacherId() == null) {
@@ -185,7 +185,7 @@ public class ScheduleController {
 
     @GetMapping(value = "/pre-check")
     @ApiOperation(value = "预检查")
-    @SaCheckPermission("schedule:detail")
+    @SaCheckPermission("schedule:precheck")
     @XjrLog(value = "预检查", saveResponseData = true)
     public RT<String> preCheck(CourseTablePreCheckDto dto) throws Exception {
         if (dto.getPreCheckType() != null) {
@@ -218,7 +218,7 @@ public class ScheduleController {
 
     @GetMapping(value = "/getCourseNames")
     @ApiOperation(value = "查询课程接口")
-    @SaCheckPermission("schedule:detail")
+    @SaCheckPermission("schedule:getcoursenames")
     @XjrLog(value = "查询课程接口", saveResponseData = true)
     public RT<String> getCourseNames(String id) {
         String[] split = id.split(",");
@@ -252,7 +252,7 @@ public class ScheduleController {
 
     @GetMapping(value = "/getCourseInfo")
     @ApiOperation(value = "根据课程id获取课程相关信息")
-    @SaCheckPermission("schedule:detail")
+    @SaCheckPermission("schedule:getcourseinfo")
     @XjrLog(value = "根据课程id获取课程相关信息", saveResponseData = true)
     public RT<CourseNamesVo> getCourseInfo(String id) {
         String[] split = id.split(",");
@@ -368,6 +368,7 @@ public class ScheduleController {
 
     @PostMapping("/schedule-week-export-query")
     @ApiOperation(value = "按周导出课表")
+    @SaCheckPermission("schedule:scheduleweekexportquery")
     @XjrLog(value = "按周导出课表")
     public ResponseEntity<byte[]> scheduleWeekExportQuery(@Valid @RequestBody CourseTableDto dto) {
 //    @GetMapping("/schedule-week-export-query")
@@ -380,7 +381,7 @@ public class ScheduleController {
 
     @GetMapping(value = "/login-url")
     @ApiOperation(value = "获取单点登录地址")
-    @SaCheckPermission("schedule:detail")
+    @SaCheckPermission("schedule:loginurl")
     @XjrLog(value = "获取单点登录地址", saveResponseData = true)
     public RT<String> getAccessToken() throws Exception {
         XjrUser xjrUser = teacherService.getById(StpUtil.getLoginIdAsLong());
@@ -408,7 +409,7 @@ public class ScheduleController {
 
     @GetMapping(value = "/week-list")
     @ApiOperation(value = "获取周次列表")
-    @SaCheckPermission("schedule:detail")
+    @SaCheckPermission("schedule:weeklist")
     @XjrLog(value = "获取周次列表")
     public RT<List<ScheduleWeekVo>> weekList(@Valid ScheduleWeekDto dto) {
 
@@ -446,7 +447,7 @@ public class ScheduleController {
 
     @GetMapping(value = "/class-list")
     @ApiOperation(value = "根据课表获取教师所教班级")
-    @SaCheckPermission("schedule:detail")
+    @SaCheckPermission("schedule:classlist")
     @XjrLog(value = "根据课表获取教师所教班级")
     public RT<List<ClassOptionVo>> classList(@Valid ClassOptionDto dto) {
         if (dto.getUserId() == null) {
@@ -458,7 +459,7 @@ public class ScheduleController {
 
     @PostMapping(value = "/cancel")
     @ApiOperation(value = "调课顶课的作废")
-    @SaCheckPermission("schedule:detail")
+    @SaCheckPermission("schedule:cancel")
     @XjrLog(value = "调课顶课的作废", saveResponseData = true)
     public RT<Boolean> cancel(@Valid @RequestBody WfCourseAdjustDto dto) {
 
@@ -468,7 +469,7 @@ public class ScheduleController {
 
     @GetMapping(value = "/is-contains-all")
     @ApiOperation(value = "判断登录者是否有查看所有课表的权限")
-    @SaCheckPermission("schedule:detail")
+    @SaCheckPermission("schedule:iscontainsall")
     @XjrLog(value = "判断登录者是否有查看所有课表的权限", saveResponseData = true)
     public RT<Boolean> classList() {
         if (StpUtil.getRoleList().contains("KeBiao")) {
@@ -479,7 +480,7 @@ public class ScheduleController {
 
     @PostMapping("/export-query")
     @ApiOperation(value = "导出课表")
-    @SaCheckPermission("schedule:detail")
+    @SaCheckPermission("schedule:exportquery")
     @XjrLog(value = "导出课表")
     public ResponseEntity<byte[]> exportQuery(@Valid @RequestBody CourseTableExportQueryDto dto) throws IOException {
         ByteArrayOutputStream bot = courseTableService.exportQuery(dto);

+ 1 - 1
src/main/java/com/xjrsoft/module/schedule/controller/TodayScheduleController.java

@@ -39,7 +39,7 @@ public class TodayScheduleController {
 
     @GetMapping(value = "/list")
     @ApiOperation(value = "今日安排查询")
-    @SaCheckPermission("schedule:detail")
+    @SaCheckPermission("todayschedule:list")
     @XjrLog(value = "今日安排查询", saveResponseData = true)
     public RT<List<TodayScheduleVo>> receiveMsg(@Valid TodaySchedulePageDto dto){
         if(dto.getUserId() == null){

+ 2 - 2
src/main/java/com/xjrsoft/module/student/controller/BaseClassMajorSetController.java

@@ -41,7 +41,7 @@ public class BaseClassMajorSetController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "班级专业方向表列表(分页)")
-    @SaCheckPermission("baseclassmajorset:detail")
+    @SaCheckPermission("baseclassmajorset:page")
     @XjrLog(value = "班级专业方向表列表(分页)")
     public RT<PageOutput<BaseClassMajorSetPageVo>> page(@Valid BaseClassMajorSetPageDto dto) {
 
@@ -56,7 +56,7 @@ public class BaseClassMajorSetController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询班级专业方向表信息")
-    @SaCheckPermission("baseclassmajorset:detail")
+    @SaCheckPermission("baseclassmajorset:info")
     @XjrLog(value = "根据id查询班级专业方向表信息", saveResponseData = true)
     public RT<BaseClassMajorSetVo> info(@RequestParam Long id) {
         BaseClassMajorSet baseClassMajorSet = baseClassMajorSetService.getById(id);

+ 4 - 2
src/main/java/com/xjrsoft/module/student/controller/BaseMajorCategorController.java

@@ -48,7 +48,7 @@ public class BaseMajorCategorController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "专业分类表列表(分页)")
-    @SaCheckPermission("basemajorcategor:detail")
+    @SaCheckPermission("basemajorcategor:page")
     @XjrLog(value = "专业分类表列表(分页)")
     public RT<PageOutput<BaseMajorCategorPageVo>> page(@Valid BaseMajorCategorPageDto dto) {
 
@@ -63,7 +63,7 @@ public class BaseMajorCategorController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询专业分类表信息")
-    @SaCheckPermission("basemajorcategor:detail")
+    @SaCheckPermission("basemajorcategor:info")
     @XjrLog(value = "根据id查询专业分类表信息", saveResponseData = true)
     public RT<BaseMajorCategorVo> info(@RequestParam Long id) {
         BaseMajorCategor baseMajorCategor = baseMajorCategorService.getById(id);
@@ -106,6 +106,7 @@ public class BaseMajorCategorController {
 
     @PostMapping("/import")
     @ApiOperation(value = "导入")
+    @SaCheckPermission("basemajorcategor:import")
     @XjrLog(value = "导入", saveRequestData = false, saveResponseData = true)
     public RT<Boolean> importData(@RequestParam MultipartFile file) throws IOException {
         List<BaseMajorCategorPageVo> savedDataList = EasyExcel.read(file.getInputStream()).head(BaseMajorCategorPageVo.class).sheet().doReadSync();
@@ -115,6 +116,7 @@ public class BaseMajorCategorController {
 
     @GetMapping("/export")
     @ApiOperation(value = "导出")
+    @SaCheckPermission("basemajorcategor:export")
     @XjrLog(value = "导出")
     public ResponseEntity<byte[]> exportData(@Valid BaseMajorCategorPageDto dto, @RequestParam(defaultValue = "false") Boolean isTemplate) {
         List<BaseMajorCategorPageVo> customerList = isTemplate != null && isTemplate ? new ArrayList<>() : page(dto).getData().getList();

+ 25 - 7
src/main/java/com/xjrsoft/module/student/controller/BaseNewStudentController.java

@@ -111,7 +111,8 @@ public class BaseNewStudentController {
     private final IBaseMajorSetService majorSetService;
     @GetMapping(value = "/page")
     @ApiOperation(value="新生维护信息列表(分页)")
-    @SaCheckPermission("basenewstudent:detail")
+    @SaCheckPermission("basenewstudent:page")
+    @XjrLog(value = "新生维护信息列表(分页)")
     public RT<PageOutput<BaseNewStudentPageVo>> page(@Valid BaseNewStudentPageDto dto){
         Page<BaseNewStudentPageVo> page = baseNewStudentService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
         PageOutput<BaseNewStudentPageVo> pageOutput = ConventPage.getPageOutput(page, BaseNewStudentPageVo.class);
@@ -120,7 +121,8 @@ public class BaseNewStudentController {
 
     @GetMapping(value = "/report-page")
     @ApiOperation(value="新生报到(分页)")
-    @SaCheckPermission("basenewstudent:detail")
+    @SaCheckPermission("basenewstudent:reportpage")
+    @XjrLog(value = "新生报到(分页)")
     public RT<PageOutput<BaseNewStudentPageVo>> reportPage(@Valid BaseNewStudentPageDto dto){
         List<String> roleList = StpUtil.getRoleList();
         if(roleList.contains("CLASSTE") && roleList.contains("TEACHER") && dto.getTeacherId() == null){
@@ -143,7 +145,8 @@ public class BaseNewStudentController {
 
     @GetMapping(value = "/tree")
     @ApiOperation(value="新生维护信息树")
-    @SaCheckPermission("basenewstudent:detail")
+    @SaCheckPermission("basenewstudent:tree")
+    @XjrLog(value = "新生维护信息树")
     public RT<List<BaseNewStudentTreeVo>> tree(){
         List<EnrollmentPlanGradeVo> gradeList = baseNewStudentService.getGradeList();
         List<EnrollmentPlanTreeVo> list = baseNewStudentService.getEnrollmentPlanList();
@@ -175,7 +178,8 @@ public class BaseNewStudentController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value="根据id查询新生维护信息信息")
-    @SaCheckPermission("basenewstudent:detail")
+    @SaCheckPermission("basenewstudent:info")
+    @XjrLog(value = "根据id查询新生维护信息信息")
     public RT<BaseNewStudentVo> info(@RequestParam Long id){
         BaseNewStudent baseNewStudent = baseNewStudentService.getById(id);
         if (baseNewStudent == null) {
@@ -188,6 +192,7 @@ public class BaseNewStudentController {
     @PostMapping
     @ApiOperation(value = "新增新生维护信息")
     @SaCheckPermission("basenewstudent:add")
+    @XjrLog(value = "新增新生维护信息")
     public RT<Boolean> add(@Valid @RequestBody AddBaseNewStudentDto dto){
         BaseNewStudent baseNewStudent = BeanUtil.toBean(dto, BaseNewStudent.class);
         baseNewStudent.setFirstAmbitionId(Long.parseLong(dto.getFirstAmbition()));
@@ -200,6 +205,7 @@ public class BaseNewStudentController {
     @PutMapping
     @ApiOperation(value = "修改新生维护信息")
     @SaCheckPermission("basenewstudent:edit")
+    @XjrLog(value = "修改新生维护信息")
     public RT<Boolean> update(@Valid @RequestBody UpdateBaseNewStudentDto dto){
 
         BaseNewStudent baseNewStudent = BeanUtil.toBean(dto, BaseNewStudent.class);
@@ -210,13 +216,15 @@ public class BaseNewStudentController {
     @DeleteMapping
     @ApiOperation(value = "删除新生维护信息")
     @SaCheckPermission("basenewstudent:delete")
+    @XjrLog(value = "")
     public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
         return RT.ok(baseNewStudentService.removeBatchByIds(ids));
     }
 
     @DeleteMapping("deleteByUserIds")
     @ApiOperation(value = "删除新生(保留新生信息,删除基础信息)")
-    @SaCheckPermission("basenewstudent:delete")
+    @SaCheckPermission("basenewstudent:deletebyuserids")
+    @XjrLog(value = "删除新生(保留新生信息,删除基础信息)")
     public RT<Boolean> deleteByUserIds(@Valid @RequestBody DeleteNewStudentDto dto){
         return RT.ok(baseNewStudentService.deleteByUserIds(dto));
     }
@@ -224,6 +232,8 @@ public class BaseNewStudentController {
 
     @PostMapping("/import")
     @ApiOperation(value = "导入")
+    @SaCheckPermission("basenewstudent:import")
+    @XjrLog(value = "导入", saveRequestData = false, saveResponseData = true)
     public RT<List<Map<String, String>>> importData(@RequestParam Long treeId, @RequestParam MultipartFile file) throws IOException {
         List<Map<Integer, Object>> errorList = baseNewStudentService.importData(treeId, file);
         List<Map<String, String>> result = new ArrayList<>();
@@ -253,6 +263,8 @@ public class BaseNewStudentController {
 
     @PostMapping("/score-import")
     @ApiOperation(value = "成绩导入")
+    @SaCheckPermission("basenewstudent:scoreimport")
+    @XjrLog(value = "导入", saveRequestData = false, saveResponseData = true)
     public RT<List<Map<String, String>>> scoreImport(@RequestParam MultipartFile file) throws IOException {
         List<BaseNewStudentScoreExcelVo> errorList = baseNewStudentService.scoreImport(file);
         List<Map<String, String>> result = new ArrayList<>();
@@ -272,6 +284,8 @@ public class BaseNewStudentController {
 
     @PostMapping("/active-account")
     @ApiOperation(value = "激活账号")
+    @SaCheckPermission("basenewstudent:activeaccount")
+    @XjrLog(value = "激活账号")
     public RT<Boolean> activeAccount(@Valid @RequestBody ActiveAccountDto dto) {
         User user = userService.getById(dto.getId());
         user.setMobile(dto.getMobile());
@@ -394,6 +408,8 @@ public class BaseNewStudentController {
 
     @PostMapping("/report-export-query")
     @ApiOperation(value = "导出")
+    @SaCheckPermission("basenewstudent:reportexportquery")
+    @XjrLog(value = "导出")
     public ResponseEntity<byte[]> exportData(@Valid @RequestBody BaseNewStudentPageDto dto) {
         if(dto.getBaseSemesterId() == null){
             LambdaQueryWrapper<BaseSemester> queryWrapper = new LambdaQueryWrapper<>();
@@ -432,7 +448,8 @@ public class BaseNewStudentController {
 
     @PostMapping("/change-banding-status")
     @ApiOperation(value = "修改分班状态")
-    @SaCheckPermission("basenewstudent:add")
+    @SaCheckPermission("basenewstudent:changebandingstatus")
+    @XjrLog(value = "修改分班状态")
     public RT<Boolean> changeBandingStatus(@Valid @RequestBody List<ChangeBandingStatusDto> dto){
         for (ChangeBandingStatusDto el : dto) {
             BaseNewStudent newStudent = baseNewStudentService.getById(el.getId());
@@ -454,7 +471,7 @@ public class BaseNewStudentController {
 
     @PostMapping(value = "/export-query")
     @ApiOperation(value="新生信息导出")
-    @SaCheckPermission("basenewstudent:detail")
+    @SaCheckPermission("basenewstudent:exportquery")
     @XjrLog(value = "新生信息导出")
     public ResponseEntity<byte[]> exportQuerty(@Valid @RequestBody BaseNewStudentPageDto dto){
         List<BaseNewStudentListExcelVo> dataList = new ArrayList<>();
@@ -493,6 +510,7 @@ public class BaseNewStudentController {
 
     @GetMapping("/basenewstudent-task-start")
     @ApiOperation(value = "触发新生数据同步统计")
+    @SaCheckPermission("basenewstudent:basenewstudenttaskstart")
     @XjrLog(value = "触发新生数据同步统计")
     public RT<Boolean> exportData() {
         BaseNewStudentTask basenewstudenttask = new BaseNewStudentTask();

+ 5 - 5
src/main/java/com/xjrsoft/module/student/controller/BaseNewStudentReportController.java

@@ -90,7 +90,7 @@ public class BaseNewStudentReportController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "新生维护信息列表(分页)")
-    @SaCheckPermission("basenewstudent:detail")
+    @SaCheckPermission("basenewstudentreport:page")
     @XjrLog(value = "新生维护信息列表(分页)")
     public RT<PageOutput<StudentReportRecordPlanPageVo>> page(@Valid StudentTryReadingReportPageDto dto){
         dto.setReportCategory(3);
@@ -123,7 +123,7 @@ public class BaseNewStudentReportController {
 
     @GetMapping(value = "/class-statistics")
     @ApiOperation(value="班级数据统计")
-    @SaCheckPermission("studentreportrecord:detail")
+    @SaCheckPermission("basenewstudentreport:classstatistics")
     @XjrLog(value = "班级数据统计")
     public RT<BandingTaskClassReportStatisticsVo> classStatistics(@RequestParam Long classId){
         return RT.ok(bandingTaskClassService.getTryReadingReportClassStatistics(new StudentTryReadingReportPageDto(){{
@@ -134,7 +134,7 @@ public class BaseNewStudentReportController {
 
     @GetMapping(value = "/statistics")
     @ApiOperation(value="领导统计")
-    @SaCheckPermission("studentreportrecord:detail")
+    @SaCheckPermission("basenewstudentreport:statistics")
     @XjrLog(value = "领导统计")
     public RT<StudentReportRecordStatisticsVo> statistics(@Valid StudentReportRecordStatisticsDto dto){
         if(dto.getGradeId() == null && (dto.getCategory() == null || dto.getCategory() == 1)){
@@ -324,7 +324,7 @@ public class BaseNewStudentReportController {
 
     @PostMapping(value = "/export-query")
     @ApiOperation(value="导出")
-    @SaCheckPermission("studentreportrecord:detail")
+    @SaCheckPermission("basenewstudentreport:exportquery")
     @XjrLog(value = "导出")
     public ResponseEntity<byte[]> exportQuerty(@Valid @RequestBody StudentTryReadingReportPageDto dto){
         List<StudentReportRecordExcelVo> dataList = new ArrayList<>();
@@ -360,7 +360,7 @@ public class BaseNewStudentReportController {
 
     @GetMapping(value = "/class-list")
     @ApiOperation(value="查询班级信息")
-    @SaCheckPermission("studentreportrecord:detail")
+    @SaCheckPermission("basenewstudentreport:classlist")
     @XjrLog(value = "查询班级信息")
     public RT<List<BandingTaskClassPageVo>> classList(@Valid StudentReportRecordPageDto dto){
         BandingTaskClassPageDto classDto = new BandingTaskClassPageDto();

+ 2 - 2
src/main/java/com/xjrsoft/module/student/controller/BaseStudentAssessmentCategoryController.java

@@ -41,7 +41,7 @@ public class BaseStudentAssessmentCategoryController {
 
     @GetMapping(value = "/list")
     @ApiOperation(value = "学生考核类别列表(不分页)")
-    @SaCheckPermission("basestudentassessmentcategory:detail")
+    @SaCheckPermission("basestudentassessmentcategory:list")
     @XjrLog(value = "学生考核类别列表(不分页)")
     public RT<List<BaseStudentAssessmentCategoryListVo>> list(@Valid BaseStudentAssessmentCategoryListDto dto) {
 
@@ -62,7 +62,7 @@ public class BaseStudentAssessmentCategoryController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询学生考核类别信息")
-    @SaCheckPermission("basestudentassessmentcategory:detail")
+    @SaCheckPermission("basestudentassessmentcategory:info")
     @XjrLog(value = "根据id查询学生考核类别信息", saveResponseData = true)
     public RT<BaseStudentAssessmentCategoryVo> info(@RequestParam Long id) {
         BaseStudentAssessmentCategory baseStudentAssessmentCategory = baseStudentAssessmentCategoryService.getById(id);

+ 8 - 8
src/main/java/com/xjrsoft/module/student/controller/BaseStudentAssessmentInspectionController.java

@@ -50,7 +50,7 @@ public class BaseStudentAssessmentInspectionController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "学生班级巡查考核列表(分页)")
-    @SaCheckPermission("basestudentassessmentinspection:detail")
+    @SaCheckPermission("basestudentassessmentinspection:page")
     @XjrLog(value = "学生班级巡查考核列表(分页)", saveRequestData = true)
     public RT<PageOutput<BaseStudentAssessmentInspectionPageVo>> page(@Valid BaseStudentAssessmentInspectionPageDto dto) {
         List<String> roleList = StpUtil.getRoleList();
@@ -67,7 +67,7 @@ public class BaseStudentAssessmentInspectionController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询学生班级巡查考核信息")
-    @SaCheckPermission("basestudentassessmentinspection:detail")
+    @SaCheckPermission("basestudentassessmentinspection:info")
     @XjrLog(value = "根据id查询学生班级巡查考核信息")
     public RT<BaseStudentAssessmentInspectionVo> info(@RequestParam Long id) {
         BaseStudentAssessmentInspectionVo result = inspectionService.getInfo(id);
@@ -76,7 +76,7 @@ public class BaseStudentAssessmentInspectionController {
 
     @GetMapping(value = "/mobile-page")
     @ApiOperation(value = "学生操行分记录管理列表(移动端)")
-    @SaCheckPermission("basestudentbehaviormanage:detail")
+    @SaCheckPermission("basestudentbehaviormanage:mobilepage")
     @XjrLog(value = "学生操行分记录管理列表(移动端)")
     public RT<PageOutput<BaseStudentAssessmentInspectionMobilePageVo>> mobilePage(@Valid BaseStudentAssessmentInspectionMobilePageDto dto) {
         Page<BaseStudentAssessmentInspectionMobilePageVo> page = inspectionService.getMobilePage(new Page<>(dto.getLimit(), dto.getSize()), dto);
@@ -88,7 +88,7 @@ public class BaseStudentAssessmentInspectionController {
 
     @GetMapping(value = "/mobile-info")
     @ApiOperation(value = "根据id查询学生班级巡查考核信息(移动端)")
-    @SaCheckPermission("basestudentassessmentinspection:detail")
+    @SaCheckPermission("basestudentassessmentinspection:mobileinfo")
     @XjrLog(value = "根据id查询学生班级巡查考核信息(移动端)")
     public RT<BaseStudentAssessmentInspectionMobileVo> mobileInfo(@Valid Long id) {
         BaseStudentAssessmentInspectionMobileVo result = inspectionService.getMobileInfo(id);
@@ -130,7 +130,7 @@ public class BaseStudentAssessmentInspectionController {
 
     @GetMapping(value = "/calss-quantitative-assessment-page")
     @ApiOperation(value = "班级量化考核列表(分页)")
-    @SaCheckPermission("basestudentassessmentinspection:detail")
+    @SaCheckPermission("basestudentassessmentinspection:calssquantitativeassessmentassessmentpage")
     @XjrLog(value = "班级量化考核列表(分页)")
     public RT<PageOutput<CalssQuantitativeAssessmentPageVo>> calssQuantitativeAssessmentPage(@Valid CalssQuantitativeAssessmentPageDto dto) {
         IPage<CalssQuantitativeAssessmentPageVo> page = inspectionService.getCalssQuantitativeAssessmentPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
@@ -142,7 +142,7 @@ public class BaseStudentAssessmentInspectionController {
 //    public ResponseEntity<byte[]>  exportDataQuery(@Valid @RequestBody QuantitativeAssessmentExcelDto dto) {
     @PostMapping("/export-query")
     @ApiOperation(value = "导出")
-    @SaCheckPermission("basestudentassessmentinspection:detail")
+    @SaCheckPermission("basestudentassessmentinspection:exportquery")
     @XjrLog(value = "导出")
     public ResponseEntity<byte[]> exportDataQuery(@Valid @RequestBody CalssQuantitativeAssessmentPageDto dto) throws IOException {
         byte[] bytes = inspectionService.getExcelByte(dto);
@@ -153,7 +153,7 @@ public class BaseStudentAssessmentInspectionController {
 
     @PostMapping("/cancel-student")
     @ApiOperation(value = "作废学生")
-    @SaCheckPermission("basestudentassessmentinspection:detail")
+    @SaCheckPermission("basestudentassessmentinspection:cancelstudent")
     @XjrLog(value = "作废学生")
     public RT<Boolean> cancelStudent(@RequestBody CancelStudentDto dto) {
         BaseStudentAssessmentStudentRelation relation = studentRelationService.getById(dto.getId());
@@ -179,7 +179,7 @@ public class BaseStudentAssessmentInspectionController {
 
     @PostMapping("/import")
     @ApiOperation(value = "班级考核导入")
-    @SaCheckPermission("basestudentassessmentinspection:importData")
+    @SaCheckPermission("basestudentassessmentinspection:import")
     @XjrLog(value = "班级考核导入")
     public RT<Boolean> importData(@RequestParam MultipartFile file) throws IOException {
         List<ImportBaseStudentAssessmentInspectionDto> savedDataList = EasyExcel.read(file.getInputStream()).headRowNumber(3).head(ImportBaseStudentAssessmentInspectionDto.class).sheet().doReadSync();

+ 2 - 2
src/main/java/com/xjrsoft/module/student/controller/BaseStudentAssessmentItemController.java

@@ -43,7 +43,7 @@ public class BaseStudentAssessmentItemController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "考核项目表列表(分页)")
-    @SaCheckPermission("basestudentassessmentitem:detail")
+    @SaCheckPermission("basestudentassessmentitem:page")
     @XjrLog(value = "考核项目表列表(分页)")
     public RT<PageOutput<BaseStudentAssessmentItemPageVo>> page(@Valid BaseStudentAssessmentItemPageDto dto) {
 
@@ -59,7 +59,7 @@ public class BaseStudentAssessmentItemController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询考核项目表信息")
-    @SaCheckPermission("basestudentassessmentitem:detail")
+    @SaCheckPermission("basestudentassessmentitem:info")
     @XjrLog(value = "根据id查询考核项目表信息", saveResponseData = true)
     public RT<BaseStudentAssessmentItemVo> info(@RequestParam Long id) {
         BaseStudentAssessmentItem baseStudentAssessmentItem = baseStudentAssessmentItemService.getById(id);

+ 4 - 4
src/main/java/com/xjrsoft/module/student/controller/BaseStudentAssessmentProjectController.java

@@ -59,7 +59,7 @@ public class BaseStudentAssessmentProjectController {
 
     @GetMapping(value = "/tree")
     @ApiOperation(value = "学生考核项目列表(树)")
-    @SaCheckPermission("basestudentassessmentproject:detail")
+    @SaCheckPermission("basestudentassessmentproject:tree")
     @XjrLog(value = "学生考核项目列表(树)")
     public RT<List<BaseStudentAssessmentProjectTreeVo>> tree() {
 
@@ -85,7 +85,7 @@ public class BaseStudentAssessmentProjectController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "学生考核项目列表(分页)")
-    @SaCheckPermission("basestudentassessmentproject:detail")
+    @SaCheckPermission("basestudentassessmentproject:page")
     @XjrLog(value = "学生考核项目列表(分页)")
     public RT<PageOutput<BaseStudentAssessmentProjectPageVo>> page(@Valid BaseStudentAssessmentProjectPageDto dto) {
 
@@ -106,7 +106,7 @@ public class BaseStudentAssessmentProjectController {
 
     @GetMapping(value = "/list")
     @ApiOperation(value = "学生考核项目列表(不分页)")
-    @SaCheckPermission("basestudentassessmentproject:detail")
+    @SaCheckPermission("basestudentassessmentproject:list")
     @XjrLog(value = "学生考核项目列表(不分页)")
     public RT<List<BaseStudentAssessmentProjectListVo>> list(@Valid BaseStudentAssessmentProjectListDto dto) {
 
@@ -123,7 +123,7 @@ public class BaseStudentAssessmentProjectController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询学生考核项目信息")
-    @SaCheckPermission("basestudentassessmentproject:detail")
+    @SaCheckPermission("basestudentassessmentproject:info")
     @XjrLog(value = "根据id查询学生考核项目信息", saveResponseData = true)
     public RT<BaseStudentAssessmentProjectVo> info(@RequestParam Long id) {
         BaseStudentAssessmentProject baseStudentAssessmentProject = baseStudentAssessmentProjectService.getById(id);

+ 3 - 3
src/main/java/com/xjrsoft/module/student/controller/BaseStudentBehaviorCategoryController.java

@@ -43,7 +43,7 @@ public class BaseStudentBehaviorCategoryController {
 
     @GetMapping(value = "/list")
     @ApiOperation(value = "学生操行分考核类别列表(不分页)")
-    @SaCheckPermission("basestudentbehaviorcategory:detail")
+    @SaCheckPermission("basestudentbehaviorcategory:list")
     @XjrLog(value = "学生操行分考核类别列表(不分页)")
     public RT<List<BaseStudentBehaviorCategoryListVo>> list(@Valid BaseStudentBehaviorCategoryListDto dto) {
 
@@ -59,7 +59,7 @@ public class BaseStudentBehaviorCategoryController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "学生操行分考核类别列表(分页)")
-    @SaCheckPermission("basestudentbehaviorcategory:detail")
+    @SaCheckPermission("basestudentbehaviorcategory:page")
     @XjrLog(value = "学生操行分考核类别列表(分页)")
     public RT<PageOutput<BaseStudentBehaviorCategoryPageVo>> page(@Valid BaseStudentBehaviorCategoryPageDto dto) {
 
@@ -74,7 +74,7 @@ public class BaseStudentBehaviorCategoryController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询学生操行分考核类别信息")
-    @SaCheckPermission("basestudentbehaviorcategory:detail")
+    @SaCheckPermission("basestudentbehaviorcategory:info")
     @XjrLog(value = "根据id查询学生操行分考核类别信息", saveResponseData = true)
     public RT<BaseStudentBehaviorCategoryVo> info(@RequestParam Long id) {
         BaseStudentBehaviorCategory baseStudentBehaviorCategory = baseStudentBehaviorCategoryService.getById(id);

+ 4 - 4
src/main/java/com/xjrsoft/module/student/controller/BaseStudentBehaviorManageController.java

@@ -47,7 +47,7 @@ public class BaseStudentBehaviorManageController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "学生操行分记录管理列表(pc端)")
-    @SaCheckPermission("basestudentbehaviormanage:detail")
+    @SaCheckPermission("basestudentbehaviormanage:page")
     @XjrLog(value = "学生操行分记录管理列表(pc端)")
     public RT<PageOutput<BaseStudentBehaviorManagePageVo>> page(@Valid BaseStudentBehaviorManagePageDto dto) {
         Page<BaseStudentBehaviorManagePageVo> page = baseStudentBehaviorManageService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
@@ -56,7 +56,7 @@ public class BaseStudentBehaviorManageController {
 
     @GetMapping(value = "/mobile-page")
     @ApiOperation(value = "学生操行分记录管理列表(移动端)")
-    @SaCheckPermission("basestudentbehaviormanage:detail")
+    @SaCheckPermission("basestudentbehaviormanage:mobilepage")
     @XjrLog(value = "学生操行分记录管理列表(移动端)")
     public RT<PageOutput<BaseStudentBehaviorManageMobilePageVo>> mibliePage(@Valid BaseStudentBehaviorManageMobilePageDto dto) {
         Page<BaseStudentBehaviorManageMobilePageVo> page = baseStudentBehaviorManageService.getMobilePage(new Page<>(dto.getLimit(), dto.getSize()), dto);
@@ -66,7 +66,7 @@ public class BaseStudentBehaviorManageController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询学生操行分记录管理信息(pc端)")
-    @SaCheckPermission("basestudentbehaviormanage:detail")
+    @SaCheckPermission("basestudentbehaviormanage:info")
     @XjrLog(value = "根据id查询学生操行分记录管理信息(pc端)", saveResponseData = true)
     public RT<BaseStudentBehaviorManageVo> info(@RequestParam Long id) {
         BaseStudentBehaviorManageVo baseStudentBehaviorManage = baseStudentBehaviorManageService.getInfo(id);
@@ -79,7 +79,7 @@ public class BaseStudentBehaviorManageController {
 
     @GetMapping(value = "/mobile-info")
     @ApiOperation(value = "根据id查询学生操行分记录管理信息(移动端)")
-    @SaCheckPermission("basestudentbehaviormanage:detail")
+    @SaCheckPermission("basestudentbehaviormanage:mobileinfo")
     @XjrLog(value = "根据id查询学生操行分记录管理信息(移动端)", saveResponseData = true)
     public RT<BaseStudentBehaviorManageVo> mobileInfo(@RequestParam Long id) {
         BaseStudentBehaviorManageVo baseStudentBehaviorManage = baseStudentBehaviorManageService.getInfo(id);

+ 3 - 3
src/main/java/com/xjrsoft/module/student/controller/BaseStudentBehaviorProjectController.java

@@ -48,7 +48,7 @@ public class BaseStudentBehaviorProjectController {
 
     @GetMapping(value = "/tree")
     @ApiOperation(value = "学生操行分考核项目列表(树)")
-    @SaCheckPermission("basestudentbehaviorproject:detail")
+    @SaCheckPermission("basestudentbehaviorproject:tree")
     @XjrLog(value = "学生操行分考核项目列表(树)")
     public RT<List<BaseStudentBehaviorProjectTreeVo>> tree() {
 
@@ -75,7 +75,7 @@ public class BaseStudentBehaviorProjectController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "学生操行分考核项目列表(分页)")
-    @SaCheckPermission("basestudentbehaviorproject:detail")
+    @SaCheckPermission("basestudentbehaviorproject:page")
     @XjrLog(value = "学生操行分考核项目列表(分页)")
     public RT<PageOutput<BaseStudentBehaviorProjectPageVo>> page(@Valid BaseStudentBehaviorProjectPageDto dto) {
 
@@ -94,7 +94,7 @@ public class BaseStudentBehaviorProjectController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询学生操行分考核项目信息")
-    @SaCheckPermission("basestudentbehaviorproject:detail")
+    @SaCheckPermission("basestudentbehaviorproject:info")
     @XjrLog(value = "根据id查询学生操行分考核项目信息", saveResponseData = true)
     public RT<BaseStudentBehaviorProjectVo> info(@RequestParam Long id) {
         BaseStudentBehaviorProject baseStudentBehaviorProject = baseStudentBehaviorProjectService.getById(id);

+ 2 - 2
src/main/java/com/xjrsoft/module/student/controller/BaseStudentBursariesApplicantController.java

@@ -43,7 +43,7 @@ public class BaseStudentBursariesApplicantController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "助学金申请列表(分页)")
-    @SaCheckPermission("basestudentbursariesapplicant:detail")
+    @SaCheckPermission("basestudentbursariesapplicant:page")
     @XjrLog(value = "助学金申请列表(分页)")
     public RT<PageOutput<BaseStudentBursariesApplicantPageVo>> page(@Valid BaseStudentBursariesApplicantPageDto dto) {
 
@@ -65,7 +65,7 @@ public class BaseStudentBursariesApplicantController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询助学金申请信息")
-    @SaCheckPermission("basestudentbursariesapplicant:detail")
+    @SaCheckPermission("basestudentbursariesapplicant:info")
     @XjrLog(value = "根据id查询助学金申请信息", saveResponseData = true)
     public RT<BaseStudentBursariesApplicantVo> info(@RequestParam Long id) {
         BaseStudentBursariesApplicant baseStudentBursariesApplicant = baseStudentBursariesApplicantService.getById(id);

+ 2 - 2
src/main/java/com/xjrsoft/module/student/controller/BaseStudentBursariesProjectController.java

@@ -42,7 +42,7 @@ public class BaseStudentBursariesProjectController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "助学金项目列表(分页)")
-    @SaCheckPermission("basestudentbursariesproject:detail")
+    @SaCheckPermission("basestudentbursariesproject:page")
     @XjrLog(value = "助学金项目列表(分页)")
     public RT<PageOutput<BaseStudentBursariesProjectPageVo>> page(@Valid BaseStudentBursariesProjectPageDto dto) {
         IPage<BaseStudentBursariesProjectPageVo> page = baseStudentBursariesProjectService.selectJoinListPage(ConventPage.getPage(dto), BaseStudentBursariesProjectPageVo.class,
@@ -60,7 +60,7 @@ public class BaseStudentBursariesProjectController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询助学金项目信息")
-    @SaCheckPermission("basestudentbursariesproject:detail")
+    @SaCheckPermission("basestudentbursariesproject:info")
     @XjrLog(value = "根据id查询助学金项目信息", saveResponseData = true)
     public RT<BaseStudentBursariesProjectVo> info(@RequestParam Long id) {
         BaseStudentBursariesProject baseStudentBursariesProject = baseStudentBursariesProjectService.getById(id);

+ 2 - 2
src/main/java/com/xjrsoft/module/student/controller/BaseStudentBursariesStudentController.java

@@ -41,7 +41,7 @@ public class BaseStudentBursariesStudentController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "助学金申请学生信息列表(分页)")
-    @SaCheckPermission("basestudentbursariesstudent:detail")
+    @SaCheckPermission("basestudentbursariesstudent:page")
     @XjrLog(value = "助学金申请学生信息列表(分页)")
     public RT<PageOutput<BaseStudentBursariesStudentPageVo>> page(@Valid BaseStudentBursariesStudentPageDto dto) {
 
@@ -56,7 +56,7 @@ public class BaseStudentBursariesStudentController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询助学金申请学生信息信息")
-    @SaCheckPermission("basestudentbursariesstudent:detail")
+    @SaCheckPermission("basestudentbursariesstudent:info")
     @XjrLog(value = "根据id查询助学金申请学生信息信息", saveResponseData = true)
     public RT<BaseStudentBursariesStudentVo> info(@RequestParam Long id) {
         BaseStudentBursariesStudent baseStudentBursariesStudent = baseStudentBursariesStudentService.getById(id);

+ 8 - 7
src/main/java/com/xjrsoft/module/student/controller/BaseStudentCadreController.java

@@ -61,7 +61,7 @@ public class BaseStudentCadreController {
 
     @GetMapping(value = "/classlist")
     @ApiOperation(value = "获取班主任管理的班级")
-    @SaCheckPermission("basestudentcadre:detail")
+    @SaCheckPermission("basestudentcadre:classlist")
     @XjrLog(value = "获取班主任管理的班级")
     public RT<List<BaseClass>> classList() {
         List<BaseClass> pageOutput = baseClassMapper.selectJoinList(BaseClass.class, new MPJLambdaWrapper<BaseClass>()
@@ -74,7 +74,7 @@ public class BaseStudentCadreController {
 
     @GetMapping(value = "/mobliepage")
     @ApiOperation(value = "学生干部管理列表(移动端分页)")
-    @SaCheckPermission("basestudentcadre:detail")
+    @SaCheckPermission("basestudentcadre:mobliepage")
     @XjrLog(value = "学生干部管理列表(移动端分页)")
     public RT<PageOutput<BaseStudentCadrePageVo>> mobliepage(@Valid BaseStudentCadrePageDto dto) {
         // 如果未传班级id和职务id,
@@ -114,7 +114,7 @@ public class BaseStudentCadreController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "学生干部管理列表(分页)")
-    @SaCheckPermission("basestudentcadre:detail")
+    @SaCheckPermission("basestudentcadre:page")
     @XjrLog(value = "学生干部管理列表(分页)")
     public RT<PageOutput<BaseStudentCadrePageVo>> page(@Valid BaseStudentCadrePageDto dto) {
 
@@ -126,7 +126,7 @@ public class BaseStudentCadreController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询学生干部管理信息")
-    @SaCheckPermission("basestudentcadre:detail")
+    @SaCheckPermission("basestudentcadre:info")
     @XjrLog(value = "根据id查询学生干部管理信息", saveResponseData = true)
     public RT<BaseStudentCadreVo> info(@RequestParam Long id) {
 
@@ -168,7 +168,7 @@ public class BaseStudentCadreController {
 
     @PostMapping("/addone")
     @ApiOperation(value = "新增学生干部管理(单个添加)")
-    @SaCheckPermission("basestudentcadre:insert")
+    @SaCheckPermission("basestudentcadre:addone")
     @XjrLog(value = "新增学生干部管理(单个添加)", saveResponseData = true)
     public RT<Boolean> addOne(@Valid @RequestBody AddBaseStudentCadreDto dto) {
         //判定,是否已经存在于数据库,并查询出班级id
@@ -193,7 +193,7 @@ public class BaseStudentCadreController {
 
     @PutMapping("/editStatus")
     @ApiOperation(value = "修改学生干部状态(离职、复职)")
-    @SaCheckPermission("basestudentcadre:edit")
+    @SaCheckPermission("basestudentcadre:editstatus")
     @XjrLog(value = "修改学生干部状态(离职、复职)", saveResponseData = true)
     public RT<Boolean> editStatus(@Valid @RequestBody UpdateBaseStudentCadreDto dto) {
         if (ObjectUtil.isNull(dto) || ObjectUtil.isNull(dto.getId()) || ObjectUtil.isNull(dto.getStatus()) ||
@@ -211,7 +211,7 @@ public class BaseStudentCadreController {
 
     @PutMapping("/mobile-editStatus")
     @ApiOperation(value = "修改学生干部状态(离职、复职)移动端")
-    @SaCheckPermission("basestudentcadre:edit")
+    @SaCheckPermission("basestudentcadre:mobileeditstatus")
     @XjrLog(value = "修改学生干部状态(离职、复职)移动端", saveResponseData = true)
     public RT<Boolean> editMobileStatus(@Valid @RequestBody UpdateBaseStudentCadreDto dto) {
         if (ObjectUtil.isNull(dto) || ObjectUtil.isNull(dto.getId()) || ObjectUtil.isNull(dto.getStatus())) {
@@ -255,6 +255,7 @@ public class BaseStudentCadreController {
 
     @GetMapping("/export")
     @ApiOperation(value = "导出")
+    @SaCheckPermission("basestudentcadre:export")
     @XjrLog(value = "导出")
     public ResponseEntity<byte[]> exportData(@Valid BaseStudentCadrePageDto dto, @RequestParam(defaultValue = "false") Boolean isTemplate) {
         List<BaseStudentCadrePageVo> customerList = isTemplate != null && isTemplate ? new ArrayList<>() : page(dto).getData().getList();

+ 2 - 2
src/main/java/com/xjrsoft/module/student/controller/BaseStudentDevelopmentController.java

@@ -45,7 +45,7 @@ public class BaseStudentDevelopmentController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "学生去向登记列表(分页)")
-    @SaCheckPermission("basestudentdevelopment:detail")
+    @SaCheckPermission("basestudentdevelopment:page")
     @XjrLog(value = "学生去向登记列表(分页)")
     public RT<PageOutput<BaseStudentDevelopmentPageVo>> page(@Valid BaseStudentDevelopmentPageDto dto) {
 
@@ -62,7 +62,7 @@ public class BaseStudentDevelopmentController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询学生去向登记信息")
-    @SaCheckPermission("basestudentdevelopment:detail")
+    @SaCheckPermission("basestudentdevelopment:info")
     @XjrLog(value = "根据id查询学生去向登记信息", saveResponseData = true)
     public RT<BaseStudentDevelopmentVo> info(@RequestParam Long id) {
         BaseStudentDevelopmentVo baseStudentDevelopment = developmentService.getInfoById(id);

+ 4 - 2
src/main/java/com/xjrsoft/module/student/controller/BaseStudentGraduateController.java

@@ -46,7 +46,7 @@ public class BaseStudentGraduateController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "学生毕业管理列表(分页)")
-    @SaCheckPermission("basestudentgraduate:detail")
+    @SaCheckPermission("basestudentgraduate:page")
     @XjrLog(value = "学生毕业管理列表(分页)")
     public RT<PageOutput<BaseStudentGraduatePageVo>> page(@Valid BaseStudentGraduatePageDto dto) {
         Page<BaseStudentGraduatePageVo> page = baseStudentGraduateService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
@@ -56,7 +56,7 @@ public class BaseStudentGraduateController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询学生毕业管理信息")
-    @SaCheckPermission("basestudentgraduate:detail")
+    @SaCheckPermission("basestudentgraduate:info")
     @XjrLog(value = "根据id查询学生毕业管理信息", saveResponseData = true)
     public RT<BaseStudentGraduateVo> info(@RequestParam Long id) {
         BaseStudentGraduateVo baseStudentGraduateVo = baseStudentGraduateService.getInfoById(id);
@@ -89,6 +89,7 @@ public class BaseStudentGraduateController {
 
     @PostMapping("/import")
     @ApiOperation(value = "导入")
+    @SaCheckPermission("basestudentgraduate:import")
     @XjrLog(value = "导入", saveRequestData = false, saveResponseData = true)
     public RT<Boolean> importData(@RequestParam MultipartFile file) throws IOException {
         List<BaseStudentGraduatePageVo> savedDataList = EasyExcel.read(file.getInputStream()).head(BaseStudentGraduatePageVo.class).sheet().doReadSync();
@@ -98,6 +99,7 @@ public class BaseStudentGraduateController {
 
     @GetMapping("/export")
     @ApiOperation(value = "导出")
+    @SaCheckPermission("basestudentgraduate:export")
     @XjrLog(value = "导出")
     public ResponseEntity<byte[]> exportData(@Valid BaseStudentGraduatePageDto dto, @RequestParam(defaultValue = "false") Boolean isTemplate) {
         List<BaseStudentGraduatePageVo> customerList = isTemplate != null && isTemplate ? new ArrayList<>() : page(dto).getData().getList();

+ 8 - 8
src/main/java/com/xjrsoft/module/student/controller/BaseStudentInfoController.java

@@ -46,7 +46,7 @@ public class BaseStudentInfoController {
 
     @GetMapping(value = "/mobile-page")
     @ApiOperation(value = "学生列表(分页)")
-    @SaCheckPermission("basestudentpost:detail")
+    @SaCheckPermission("basestudentinfo:mobilepage")
     @XjrLog(value = "学生列表(分页)")
     public RT<PageOutput<BaseStudentInfoPageVo>> mobilePage(@Valid BaseStudentInfoPageDto dto) {
         Page<BaseStudentInfoPageVo> mobilePage = baseStudentSchoolRollService.getMobilePage(new Page<>(dto.getLimit(), dto.getSize()), dto);
@@ -60,7 +60,7 @@ public class BaseStudentInfoController {
 
     @GetMapping(value = "/mobile-page-statistics")
     @ApiOperation(value = "学生列表人数统计")
-    @SaCheckPermission("basestudentpost:detail")
+    @SaCheckPermission("basestudentinfo:mobilepagestatistics")
     @XjrLog(value = "学生列表人数统计", saveResponseData = true)
     public RT<BaseStudentInfoPageDataVo> mobilePageStatistics(@Valid BaseStudentInfoPageDto dto) {
         BaseStudentInfoPageDataVo result = baseStudentSchoolRollService.getMobilePageStatistics(dto);
@@ -69,7 +69,7 @@ public class BaseStudentInfoController {
 
     @GetMapping(value = "/mobile-class-statistics")
     @ApiOperation(value = "班级统计(移动端)")
-    @SaCheckPermission("basestudentpost:detail")
+    @SaCheckPermission("basestudentinfo:mobileclassstatistics")
     @XjrLog(value = "班级统计(移动端)", saveResponseData = true)
     public RT<MobileClassStatisticsVo> mobileClassStatistics(@Valid BaseStudentInfoPageDto dto) {
         MobileClassStatisticsVo result = baseStudentSchoolRollService.getMobileClassStatistics(dto);
@@ -78,7 +78,7 @@ public class BaseStudentInfoController {
 
     @PutMapping
     @ApiOperation(value = "修改学生信息")
-    @SaCheckPermission("basestudentpost:edit")
+    @SaCheckPermission("basestudentinfo:edit")
     @XjrLog(value = "修改学生信息", saveResponseData = true)
     public RT<Boolean> update(@Valid @RequestBody UpdateBaseStudentInfoDto dto) {
         return RT.ok(baseStudentSchoolRollService.updateInfo(dto));
@@ -86,7 +86,7 @@ public class BaseStudentInfoController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询详情信息")
-    @SaCheckPermission("basestudentpost:detail")
+    @SaCheckPermission("basestudentinfo:info")
     @XjrLog(value = "根据id查询详情信息", saveResponseData = true)
     public RT<BaseStudentInfoDetailVo> info(@RequestParam Long id) {
         BaseStudentInfoDetailDto dto = new BaseStudentInfoDetailDto();
@@ -103,7 +103,7 @@ public class BaseStudentInfoController {
 
     @GetMapping(value = "/studentinfoByKeyWord")
     @ApiOperation(value = "根据姓名或者身份证号查询详情信息")
-    @SaCheckPermission("basestudentpost:detail")
+    @SaCheckPermission("basestudentinfo:studentinfobykeyword")
     @XjrLog(value = "根据姓名或者身份证号查询详情信息")
     public RT<List<BaseStudentSompleInfoVo>> info(@Valid BaseStudentSimpleInfoDto dto) {
         dto.setArchivesStatus(ArchivesStatusEnum.FB2901.getCode());
@@ -113,7 +113,7 @@ public class BaseStudentInfoController {
 
     @GetMapping(value = "/studentinfoByKeyWordNotReading")
     @ApiOperation(value = "根据姓名或者身份证号查询不在读学生详情信息")
-    @SaCheckPermission("basestudentpost:detail")
+    @SaCheckPermission("basestudentinfo:studentinfobykeywordnotreading")
     @XjrLog(value = "根据姓名或者身份证号查询不在读学生详情信息")
     public RT<List<BaseStudentSompleInfoVo>> studentinfoByKeyWordNotReading(@Valid BaseStudentSimpleInfoDto dto) {
         dto.setFindNewStudent(0);
@@ -124,7 +124,7 @@ public class BaseStudentInfoController {
 
     @GetMapping(value = "/getWhitelistInfo")
     @ApiOperation(value = "根据userId查询白名单信息(不传默认查询登录者)")
-    @SaCheckPermission("basestudentpost:detail")
+    @SaCheckPermission("basestudentinfo:getwhitelistinfo")
     @XjrLog(value = "根据userId查询白名单信息(不传默认查询登录者)", saveResponseData = true)
     public RT<WhitelistInfoVo> getWhitelistInfo(Long userId) {
         if (userId == null) {

+ 4 - 3
src/main/java/com/xjrsoft/module/student/controller/BaseStudentPostController.java

@@ -51,7 +51,7 @@ public class BaseStudentPostController {
 
     @GetMapping(value = "/list")
     @ApiOperation(value = "学生职务设置列表(不分页)")
-    @SaCheckPermission("basestudentpost:detail")
+    @SaCheckPermission("basestudentpost:list")
     @XjrLog(value = "学生职务设置列表(不分页)")
     public RT<List<BaseStudentPostListVo>> list(@Valid BaseStudentPostListDto dto) {
 
@@ -70,7 +70,7 @@ public class BaseStudentPostController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "学生职务设置列表(分页)")
-    @SaCheckPermission("basestudentpost:detail")
+    @SaCheckPermission("basestudentpost:page")
     @XjrLog(value = "学生职务设置列表(分页)")
     public RT<PageOutput<BaseStudentPostPageVo>> page(@Valid BaseStudentPostPageDto dto) {
 
@@ -90,7 +90,7 @@ public class BaseStudentPostController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询学生职务设置信息")
-    @SaCheckPermission("basestudentpost:detail")
+    @SaCheckPermission("basestudentpost:info")
     @XjrLog(value = "根据id查询学生职务设置信息", saveResponseData = true)
     public RT<BaseStudentPostVo> info(@RequestParam Long id) {
         BaseStudentPost baseStudentPost = baseStudentPostService.getById(id);
@@ -132,6 +132,7 @@ public class BaseStudentPostController {
 
     @GetMapping("/export")
     @ApiOperation(value = "导出")
+    @SaCheckPermission("basestudentpost:export")
     @XjrLog(value = "导出")
     public ResponseEntity<byte[]> exportData(@Valid BaseStudentPostPageDto dto, @RequestParam(defaultValue = "false") Boolean isTemplate) {
         List<BaseStudentPostPageVo> customerList = isTemplate != null && isTemplate ? new ArrayList<>() : page(dto).getData().getList();

+ 5 - 5
src/main/java/com/xjrsoft/module/student/controller/BaseStudentPunishmentInfoController.java

@@ -50,7 +50,7 @@ public class BaseStudentPunishmentInfoController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "学生处分信息管理列表(分页)")
-    @SaCheckPermission("basestudentpunishmentinfo:detail")
+    @SaCheckPermission("basestudentpunishmentinfo:page")
     @XjrLog(value = "学生处分信息管理列表(分页)")
     public RT<PageOutput<BaseStudentPunishmentInfoPageVo>> page(@Valid BaseStudentPunishmentInfoPageDto dto) {
         IPage<BaseStudentPunishmentInfoPageVo> pageList = baseStudentPunishmentInfoService.selectJoinListPagePc(dto);
@@ -61,7 +61,7 @@ public class BaseStudentPunishmentInfoController {
 
     @GetMapping(value = "/mobile-page")
     @ApiOperation(value = "学生处分信息管理列表(移动端分页)")
-    @SaCheckPermission("basestudentpunishmentinfo:detail")
+    @SaCheckPermission("basestudentpunishmentinfo:mobilepage")
     @XjrLog(value = "学生处分信息管理列表(移动端分页)")
     public RT<PageOutput<BaseStudentPunishmentInfoMobilePageVo>> mobilePage(@Valid BaseStudentPunishmentInfoMobilePageDto dto) {
 
@@ -72,7 +72,7 @@ public class BaseStudentPunishmentInfoController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询学生处分信息管理信息")
-    @SaCheckPermission("basestudentpunishmentinfo:detail")
+    @SaCheckPermission("basestudentpunishmentinfo:info")
     @XjrLog(value = "根据id查询学生处分信息管理信息", saveResponseData = true)
     public RT<BaseStudentPunishmentInfoDetailVo> info(@RequestParam Long id) {
         BaseStudentPunishmentInfoDetailVo baseStudentPunishmentInfoDetailVo = baseStudentPunishmentInfoService.getDetailById(id);
@@ -88,7 +88,7 @@ public class BaseStudentPunishmentInfoController {
 
     @GetMapping(value = "/mobile-info")
     @ApiOperation(value = "根据id查询学生处分信息管理信息(移动端)")
-    @SaCheckPermission("basestudentpunishmentinfo:detail")
+    @SaCheckPermission("basestudentpunishmentinfo:mobileinfo")
     @XjrLog(value = "根据id查询学生处分信息管理信息(移动端)", saveResponseData = true)
     public RT<BaseStudentPunishmentInfoMobileDetailVo> mobileInfo(@RequestParam Long id) {
         BaseStudentPunishmentInfoMobileDetailVo baseStudentPunishmentInfoMobileDetailVo = baseStudentPunishmentInfoService.getMobileInfo(id);
@@ -127,7 +127,7 @@ public class BaseStudentPunishmentInfoController {
 
     @GetMapping("/handle-list")
     @ApiOperation(value = "处分处理情况查询")
-    @SaCheckPermission("basestudentpunishmentinfo:handle-list")
+    @SaCheckPermission("basestudentpunishmentinfo:handlelist")
     @XjrLog(value = "处分处理情况查询")
     public RT<List<BasePunishmentStudentHandleVo>> handleList(@RequestParam Long id) {
         List<BasePunishmentStudentHandle> list = handleService.list(

+ 4 - 4
src/main/java/com/xjrsoft/module/student/controller/BaseStudentScholarshipApplicantController.java

@@ -52,7 +52,7 @@ public class BaseStudentScholarshipApplicantController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "奖学金申请列表(分页)")
-    @SaCheckPermission("basestudentscholarshipapplicant:detail")
+    @SaCheckPermission("basestudentscholarshipapplicant:page")
     @XjrLog(value = "奖学金申请列表(分页)")
     public RT<PageOutput<BaseStudentScholarshipApplicantPageVo>> page(@Valid BaseStudentScholarshipApplicantPageDto dto) {
         IPage<BaseStudentScholarshipApplicantPageVo> page = applicantService.selectJoinListPage(ConventPage.getPage(dto), BaseStudentScholarshipApplicantPageVo.class,
@@ -80,7 +80,7 @@ public class BaseStudentScholarshipApplicantController {
 
     @GetMapping(value = "/scholarship-page")
     @ApiOperation(value = "奖学金名称表(分页)")
-    @SaCheckPermission("basestudentscholarshipapplicant:detail")
+    @SaCheckPermission("basestudentscholarshipapplicant:scholarshippage")
     @XjrLog(value = "奖学金名称表(分页)")
     public RT<PageOutput<BaseStudentScholarshipApplicantCategoryPageVo>> scholarshiPage(@Valid BaseStudentScholarshipApplicantCategoryPageDto dto) {
         IPage<BaseStudentScholarshipApplicantCategoryPageVo> page = applicantService.getScholarshiPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
@@ -90,7 +90,7 @@ public class BaseStudentScholarshipApplicantController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询奖学金申请信息")
-    @SaCheckPermission("basestudentscholarshipapplicant:detail")
+    @SaCheckPermission("basestudentscholarshipapplicant:info")
     @XjrLog(value = "根据id查询奖学金申请信息", saveResponseData = true)
     public RT<BaseStudentScholarshipApplicantVo> info(@RequestParam Long id) {
         BaseStudentScholarshipApplicant baseStudentScholarshipApplicant = applicantService.getById(id);
@@ -131,7 +131,7 @@ public class BaseStudentScholarshipApplicantController {
 
     @GetMapping(value = "/option-select")
     @ApiOperation(value = "申请人下拉列表")
-    @SaCheckPermission("basestudentscholarshipapplicant:detail")
+    @SaCheckPermission("basestudentscholarshipapplicant:optionselect")
     @XjrLog(value = "申请人下拉列表")
     public RT<List<ScholarshipApplicantOptionVo>> optionSelect(@Valid BaseStudentScholarshipApplicantPageDto dto) {
         List<BaseStudentScholarshipApplicant> applicantList = applicantService.list(

+ 3 - 3
src/main/java/com/xjrsoft/module/student/controller/BaseStudentScholarshipCategoryController.java

@@ -47,7 +47,7 @@ public class BaseStudentScholarshipCategoryController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "奖学金类别列表(分页)")
-    @SaCheckPermission("basestudentscholarshipcategory:detail")
+    @SaCheckPermission("basestudentscholarshipcategory:page")
     @XjrLog(value = "奖学金类别列表(分页)")
     public RT<PageOutput<BaseStudentScholarshipCategoryPageVo>> page(@Valid BaseStudentScholarshipCategoryPageDto dto) {
         IPage<BaseStudentScholarshipCategoryPageVo> page = categoryService.selectJoinListPage(ConventPage.getPage(dto), BaseStudentScholarshipCategoryPageVo.class,
@@ -70,7 +70,7 @@ public class BaseStudentScholarshipCategoryController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询奖学金类别信息")
-    @SaCheckPermission("basestudentscholarshipcategory:detail")
+    @SaCheckPermission("basestudentscholarshipcategory:info")
     @XjrLog(value = "根据id查询奖学金类别信息", saveResponseData = true)
     public RT<BaseStudentScholarshipCategoryVo> info(@RequestParam Long id) {
         BaseStudentScholarshipCategory baseStudentScholarshipCategory = categoryService.getByIdDeep(id);
@@ -109,7 +109,7 @@ public class BaseStudentScholarshipCategoryController {
 
     @GetMapping(value = "/statistics-page")
     @ApiOperation(value = "奖学金统计(分页)")
-    @SaCheckPermission("basestudentscholarshipcategory:detail")
+    @SaCheckPermission("basestudentscholarshipcategory:statisticspage")
     @XjrLog(value = "奖学金统计(分页)")
     public RT<PageOutput<BaseStudentScholarshipCategoryStatisticPageVo>> statisticsPage(@Valid BaseStudentScholarshipReleasePageDto dto) {
         Page<BaseStudentScholarshipCategoryStatisticPageVo> page = categoryService.getStatisticsPage(new Page<>(dto.getLimit(), dto.getSize()), dto);

+ 5 - 4
src/main/java/com/xjrsoft/module/student/controller/BaseStudentScholarshipReleaseController.java

@@ -55,7 +55,7 @@ public class BaseStudentScholarshipReleaseController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "奖学金发放记录表列表(分页)")
-    @SaCheckPermission("basestudentscholarshiprelease:detail")
+    @SaCheckPermission("basestudentscholarshiprelease:page")
     @XjrLog(value = "奖学金发放记录表列表(分页)")
     public RT<PageOutput<BaseStudentScholarshipReleasePageVo>> page(@Valid BaseStudentScholarshipReleasePageDto dto) {
 
@@ -66,7 +66,7 @@ public class BaseStudentScholarshipReleaseController {
 
     @GetMapping(value = "/record")
     @ApiOperation(value = "奖学金发放记录表列表(分页)")
-    @SaCheckPermission("basestudentscholarshiprelease:detail")
+    @SaCheckPermission("basestudentscholarshiprelease:record")
     @XjrLog(value = "奖学金发放记录表列表(分页)")
     public RT<PageOutput<BaseStudentScholarshipReleaseRecordVo>> record(@Valid BaseStudentScholarshipReleasePageDto dto) {
         IPage<BaseStudentScholarshipReleaseRecordVo> page = releaseService.selectJoinListPage(ConventPage.getPage(dto), BaseStudentScholarshipReleaseRecordVo.class,
@@ -81,7 +81,7 @@ public class BaseStudentScholarshipReleaseController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据申请id查询奖学金发放记录表信息")
-    @SaCheckPermission("basestudentscholarshiprelease:detail")
+    @SaCheckPermission("basestudentscholarshiprelease:info")
     @XjrLog(value = "根据申请id查询奖学金发放记录表信息", saveResponseData = true)
     public RT<BaseStudentScholarshipReleaseVo> info(@RequestParam Long id) {
         BaseStudentScholarshipApplicant applicant = applicantService.getById(id);
@@ -149,7 +149,7 @@ public class BaseStudentScholarshipReleaseController {
 
     @PostMapping("add-student")
     @ApiOperation(value = "添加学生")
-    @SaCheckPermission("basestudentscholarshiprelease:add")
+    @SaCheckPermission("basestudentscholarshiprelease:addstudent")
     @XjrLog(value = "添加学生", saveResponseData = true)
     public RT<Boolean> addStudent(@Valid @RequestBody AddStudentScholarshipDto dto) {
         if (dto.getApplicantIds() != null && !dto.getApplicantIds().isEmpty()) {
@@ -186,6 +186,7 @@ public class BaseStudentScholarshipReleaseController {
 
     @PostMapping("/import")
     @ApiOperation(value = "奖助学金发放导入")
+    @SaCheckPermission("basestudentscholarshiprelease:import")
     @XjrLog(value = "奖助学金发放导入", saveRequestData = false, saveResponseData = true)
     public RT<List<Map<String, String>>> scoreImport(@RequestParam MultipartFile file) throws IOException {
         List<Map<String, String>> maps = applicantService.importData(file);

+ 4 - 4
src/main/java/com/xjrsoft/module/student/controller/CadreDeptController.java

@@ -47,7 +47,7 @@ public class CadreDeptController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "干部部门列表(分页)")
-    @SaCheckPermission("cadredept:detail")
+    @SaCheckPermission("cadredept:page")
     @XjrLog(value = "干部部门列表(分页)")
     public RT<PageOutput<CadreDeptPageVo>> page(@Valid CadreDeptPageDto dto) {
 
@@ -64,7 +64,7 @@ public class CadreDeptController {
 
     @GetMapping(value = "/tree")
     @ApiOperation(value = "干部部门树")
-    @SaCheckPermission("cadredept:detail")
+    @SaCheckPermission("cadredept:tree")
     @XjrLog(value = "干部部门树")
     public RT<List<CadreDeptTreeVo>> tree(CadreDeptTreeDto dto) {
         List<CadreDeptTreeVo> treeVoList = cadreDeptService.getCadreDeptTree(dto);
@@ -73,7 +73,7 @@ public class CadreDeptController {
 
     @PutMapping("/updateInstructorUser")
     @ApiOperation(value = "部门(添加/修改)部门指导教师用户编号")
-    @SaCheckPermission("cadredept:edit")
+    @SaCheckPermission("cadredept:updateinstructoruser")
     @XjrLog(value = "部门(添加/修改)部门指导教师用户编号", saveResponseData = true)
     public RT<Boolean> updateInstructorUser(@Valid @RequestBody UpdateCadreDeptDto dto) {
         CadreDept cadreDept = BeanUtil.toBean(dto, CadreDept.class);
@@ -82,7 +82,7 @@ public class CadreDeptController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询干部部门信息")
-    @SaCheckPermission("cadredept:detail")
+    @SaCheckPermission("cadredept:info")
     @XjrLog(value = "根据id查询干部部门信息", saveResponseData = true)
     public RT<CadreDeptVo> info(@RequestParam Long id) {
         CadreDept cadreDept = cadreDeptService.getById(id);

+ 4 - 3
src/main/java/com/xjrsoft/module/student/controller/ClassHonorsController.java

@@ -43,7 +43,7 @@ public class ClassHonorsController {
 
     @GetMapping(value = "/semesterClassTree")
     @ApiOperation(value = "班级荣誉学期班级树")
-    @SaCheckPermission("classhonors:detail")
+    @SaCheckPermission("classhonors:semesterclasstree")
     @XjrLog(value = "班级荣誉学期班级树")
     public RT<List<ClassHonorsSemesterClassTreeVo>> semesterClassTree() {
         List<ClassHonorsSemesterClassTreeVo> list = classHonorsService.getSemesterClassTree();
@@ -52,7 +52,7 @@ public class ClassHonorsController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "班级荣誉列表(分页)")
-    @SaCheckPermission("classhonors:detail")
+    @SaCheckPermission("classhonors:page")
     @XjrLog(value = "班级荣誉列表(分页)")
     public RT<PageOutput<ClassHonorsPageVo>> page(@Valid ClassHonorsPageDto dto) {
         IPage<ClassHonorsPageVo> page = classHonorsService.getPagePC(dto);
@@ -62,7 +62,7 @@ public class ClassHonorsController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询班级荣誉信息")
-    @SaCheckPermission("classhonors:detail")
+    @SaCheckPermission("classhonors:info")
     @XjrLog(value = "根据id查询班级荣誉信息", saveResponseData = true)
     public RT<ClassHonorsVo> info(@RequestParam Long id) {
         ClassHonorsVo classHonorsVo = classHonorsService.getInfoById(id);
@@ -102,6 +102,7 @@ public class ClassHonorsController {
 
     @PostMapping("/import")
     @ApiOperation(value = "导入")
+    @SaCheckPermission("classhonors:import")
     @XjrLog(value = "导入", saveRequestData = false, saveResponseData = true)
     public RT<Boolean> importData(@RequestParam MultipartFile file) throws IOException {
         List<ClassHonorsPageVo> savedDataList = EasyExcel.read(file.getInputStream()).head(ClassHonorsPageVo.class).sheet().doReadSync();

+ 12 - 11
src/main/java/com/xjrsoft/module/student/controller/ConsumptionController.java

@@ -52,7 +52,7 @@ public class ConsumptionController {
 
     @GetMapping(value = "/tree")
     @ApiOperation(value = "学生在读毕业年级班级树")
-    @SaCheckPermission("studentmanager:detail")
+    @SaCheckPermission("consumption:tree")
     @XjrLog(value = "学生在读毕业年级班级树")
     public RT<List<BaseClassTreeVo>> tree() {
         List<BaseClassTreeVo> voList = new ArrayList<>();
@@ -97,7 +97,7 @@ public class ConsumptionController {
 
     @GetMapping(value = "/personal-info")
     @ApiOperation(value = "学生个人信息")
-    @SaCheckPermission("consumption:detail")
+    @SaCheckPermission("consumption:personalinfo")
     @XjrLog(value = "学生个人信息", saveResponseData = true)
     public RT<PersonalPortraitPersonalInfoVo> personalInfo(@Valid PersonalInfoDto dto) {
         PersonalPortraitPersonalInfoVo info = pbVXssfdetailService.getPersonalInfo(dto);
@@ -106,7 +106,7 @@ public class ConsumptionController {
 
     @GetMapping(value = "/detail-page")
     @ApiOperation(value = "学生收费明细分页查询")
-    @SaCheckPermission("consumption:detail")
+    @SaCheckPermission("consumption:detailpage")
     @XjrLog(value = "学生收费明细分页查询")
     public RT<PageOutput<PbVXssfdetailPageVo>> detailPage(@Valid PbVXssfdetailPageDto dto) {
         Page<PbVXssfdetailPageVo> page = pbVXssfdetailService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
@@ -116,7 +116,7 @@ public class ConsumptionController {
 
     @GetMapping(value = "/pb_vx_sxxsfytbPage")
     @ApiOperation(value = "学生消费管理页分页查询")
-    @SaCheckPermission("consumption:detail")
+    @SaCheckPermission("consumption:pbvxsxxsfytbPage")
     @XjrLog(value = "学生消费管理页分页查询")
     public RT<PageOutput<PbVXsxxsfytbPageVo>> pbVXsxxsfytbPage(@Valid PbVXsxxsfytbPageDto dto) {
         List<String> roleList = StpUtil.getRoleList();
@@ -130,7 +130,7 @@ public class ConsumptionController {
 
     @GetMapping(value = "/cost-information")
     @ApiOperation(value = "费用信息")
-    @SaCheckPermission("consumption:detail")
+    @SaCheckPermission("consumption:costinformation")
     @XjrLog(value = "费用信息", saveResponseData = true)
     public RT<PersonalPortraitFeeInformationVo> costInformation(@Valid PersonalPortraitFeeInformationDto dto) {
         return RT.ok(pbVXsxxsfytbService.listCostInformation(dto));
@@ -138,6 +138,7 @@ public class ConsumptionController {
 
     @PostMapping("/export-query")
     @ApiOperation(value = "有参导出")
+    @SaCheckPermission("consumption:exportquery")
     @XjrLog(value = "有参导出")
     public ResponseEntity<byte[]> exportData(@RequestBody PbVXsxxsfytbExcelDto dto) {
         List<PbVXsxxsfytbExcelVo> dataList = pbVXsxxsfytbService.getList(dto);
@@ -149,7 +150,7 @@ public class ConsumptionController {
 
     @GetMapping(value = "/fee-detail")
     @ApiOperation(value = "学生缴费的详情")
-    @SaCheckPermission("consumption:detail")
+    @SaCheckPermission("consumption:feedetail")
     @XjrLog(value = "学生缴费的详情")
     public RT<List<FeeDetailListVo>> feeDetail(@RequestParam String studentcode, String beltcode) {
         return RT.ok(pbVXsxxsfytbService.getFeeDetail(studentcode, beltcode));
@@ -157,7 +158,7 @@ public class ConsumptionController {
 
     @GetMapping(value = "/student-category-stat")
     @ApiOperation(value = "学生类别的人数统计")
-    @SaCheckPermission("consumption:detail")
+    @SaCheckPermission("consumption:studentcategorystat")
     @XjrLog(value = "学生类别的人数统计", saveResponseData = true)
     public RT<PbStudentCategoryVo> studentCategory(@Valid PbVXsxxsfytbStatDto dto) {
         return RT.ok(pbVXsxxsfytbService.studentCategoryStat(dto));
@@ -165,7 +166,7 @@ public class ConsumptionController {
 
     @GetMapping(value = "/stduy-status-stat")
     @ApiOperation(value = "就读方式的统计")
-    @SaCheckPermission("consumption:detail")
+    @SaCheckPermission("consumption:stduystatusstat")
     @XjrLog(value = "就读方式的统计", saveResponseData = true)
     public RT<PbStduyStatusVo> stduyStatus(@Valid PbVXsxxsfytbStatDto dto) {
         return RT.ok(pbVXsxxsfytbService.stduyStatusStat(dto));
@@ -173,7 +174,7 @@ public class ConsumptionController {
 
     @GetMapping(value = "/class-qf-page")
     @ApiOperation(value = "班级欠费排序")
-    @SaCheckPermission("consumption:detail")
+    @SaCheckPermission("consumption:classqfpage")
     @XjrLog(value = "班级欠费排序")
     public RT<PageOutput<ClassQfPageVo>> classQfPage(@Valid PbVXsxxsfytbStatDto dto) {
         Page<ClassQfPageVo> classQfPage = pbVXsxxsfytbService.getClassQfPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
@@ -183,7 +184,7 @@ public class ConsumptionController {
 
     @GetMapping(value = "/feeitem-stat")
     @ApiOperation(value = "各年级的教材费、住宿费、军训费缴费统计")
-    @SaCheckPermission("consumption:detail")
+    @SaCheckPermission("consumption:feeitemstat")
     @XjrLog(value = "各年级的教材费、住宿费、军训费缴费统计", saveResponseData = true)
     public RT<PbFeeitemStatVo> feeitemStat(@Valid PbVXsxxsfytbStatDto dto) {
         return RT.ok(pbVXsxxsfytbService.feeitemStat(dto));
@@ -191,7 +192,7 @@ public class ConsumptionController {
 
     @PostMapping(value = "/class-qf-export-query")
     @ApiOperation(value = "班级欠费排序-导出")
-    @SaCheckPermission("consumption:detail")
+    @SaCheckPermission("consumption:classqfexportquery")
     @XjrLog(value = "班级欠费排序-导出")
     public ResponseEntity<byte[]> classQfExpert(@Valid @RequestBody PbVXsxxsfytbStatDto dto) {
         long count = baseClassService.count();

+ 4 - 4
src/main/java/com/xjrsoft/module/student/controller/EnrollmentPlanController.java

@@ -57,7 +57,7 @@ public class EnrollmentPlanController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "招生计划维护列表(分页)")
-    @SaCheckPermission("enrollmentplan:detail")
+    @SaCheckPermission("enrollmentplan:page")
     @XjrLog(value = "招生计划维护列表(分页)")
     public RT<PageOutput<EnrollmentPlanPageVo>> page(@Valid EnrollmentPlanPageDto dto) {
 
@@ -85,7 +85,7 @@ public class EnrollmentPlanController {
 
     @GetMapping(value = "/preview-page")
     @ApiOperation(value = "预览招生计划")
-    @SaCheckPermission("enrollmentplan:detail")
+    @SaCheckPermission("enrollmentplan:previewpage")
     @XjrLog(value = "预览招生计划", saveResponseData = true)
     public RT<PreviewEnrollmentPlanVo> previewPage(@Valid PreviewEnrollmentPlanDto dto) {
 
@@ -129,7 +129,7 @@ public class EnrollmentPlanController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询招生计划维护信息")
-    @SaCheckPermission("enrollmentplan:detail")
+    @SaCheckPermission("enrollmentplan:info")
     @XjrLog(value = "根据id查询招生计划维护信息", saveResponseData = true)
     public RT<EnrollmentPlanVo> info(@RequestParam Long id) {
         EnrollmentPlan enrollmentPlan = enrollmentPlanService.getById(id);
@@ -160,7 +160,7 @@ public class EnrollmentPlanController {
 
     @PutMapping("/change-status")
     @ApiOperation(value = "修改招生计划状态")
-    @SaCheckPermission("enrollmentplan:edit")
+    @SaCheckPermission("enrollmentplan:changestatus")
     @XjrLog(value = "修改招生计划状态", saveResponseData = true)
     public RT<Boolean> changeStatus(@Valid @RequestBody UpdateEnrollmentPlanDto dto) {
         EnrollmentPlan oldEnrollmentPlan = enrollmentPlanService.getById(dto.getId());

+ 2 - 2
src/main/java/com/xjrsoft/module/student/controller/EnrollmentPlanGraduateSchoolController.java

@@ -43,7 +43,7 @@ public class EnrollmentPlanGraduateSchoolController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "毕业学校招生计划详情列表(分页)")
-    @SaCheckPermission("enrollmentplangraduateschool:detail")
+    @SaCheckPermission("enrollmentplangraduateschool:page")
     @XjrLog(value = "毕业学校招生计划详情列表(分页)")
     public RT<PageOutput<EnrollmentPlanGraduateSchoolPageVo>> page(@Valid EnrollmentPlanGraduateSchoolPageDto dto) {
 
@@ -61,7 +61,7 @@ public class EnrollmentPlanGraduateSchoolController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询毕业学校招生计划详情信息")
-    @SaCheckPermission("enrollmentplangraduateschool:detail")
+    @SaCheckPermission("enrollmentplangraduateschool:info")
     @XjrLog(value = "根据id查询毕业学校招生计划详情信息", saveResponseData = true)
     public RT<EnrollmentPlanGraduateSchoolVo> info(@RequestParam Long id) {
         EnrollmentPlanGraduateSchool enrollmentPlanGraduateSchool = enrollmentPlanGraduateSchoolService.getById(id);

+ 4 - 4
src/main/java/com/xjrsoft/module/student/controller/EnrollmentPlanMajorSetController.java

@@ -44,7 +44,7 @@ public class EnrollmentPlanMajorSetController {
 
     @GetMapping(value = "/generated-relation-page")
     @ApiOperation(value = "已生成招生专业方向+毕业中学关系列表(分页)")
-    @SaCheckPermission("enrollmentplandetail:detail")
+    @SaCheckPermission("enrollmentplanmajorset:generatedrelationpage")
     @XjrLog(value = "已生成招生专业方向+毕业中学关系列表(分页)")
     public RT<PageOutput<EnrollmentPlanMajorSetPageVo>> generatedRelationPage(@Valid EnrollmentPlanMajorSetPageDto dto) {
 
@@ -71,7 +71,7 @@ public class EnrollmentPlanMajorSetController {
 
     @GetMapping(value = "/baseMajorSet-page")
     @ApiOperation(value = "专业分类(分页)")
-    @SaCheckPermission("enrollmentplandetail:detail")
+    @SaCheckPermission("enrollmentplanmajorset:basemajorsetpage")
     @XjrLog(value = "专业分类(分页)")
     public RT<PageOutput<BaseMajorSetOfEnrollmentPlanPageVo>> baseMajorSetOfEnrollmentPlan(@Valid BaseMajorSetOfEnrollmentPlanPageDto dto) {
         IPage<BaseMajorSetOfEnrollmentPlanPageVo> page = enrollmentPlanMajorSetService.baseMajorSetOfEnrollmentPlan(dto);
@@ -81,7 +81,7 @@ public class EnrollmentPlanMajorSetController {
 
     @GetMapping(value = "/baseGraduateSchool-list")
     @ApiOperation(value = "毕业学校")
-    @SaCheckPermission("enrollmentplandetail:detail")
+    @SaCheckPermission("enrollmentplanmajorset:basegraduateschoollist")
     @XjrLog(value = "毕业学校")
     public RT<List<BaseGraduateSchoolOfEnrollmentPlanListVo>> baseGraduateSchoolOfEnrollmentPlan(@Valid BaseGraduateSchoolOfEnrollmentPlanListDto dto) {
         List<BaseGraduateSchoolOfEnrollmentPlanListVo> result = enrollmentPlanMajorSetService.baseGraduateSchoolOfEnrollmentPlan(dto);
@@ -90,7 +90,7 @@ public class EnrollmentPlanMajorSetController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询专业方向招生计划详情信息")
-    @SaCheckPermission("enrollmentplanmajorset:detail")
+    @SaCheckPermission("enrollmentplanmajorset:info")
     @XjrLog(value = "根据id查询专业方向招生计划详情信息", saveResponseData = true)
     public RT<EnrollmentPlanMajorSetVo> info(@RequestParam Long id) {
         EnrollmentPlanMajorSet enrollmentPlanMajorSet = enrollmentPlanMajorSetService.getById(id);

+ 5 - 2
src/main/java/com/xjrsoft/module/student/controller/LeagueMembersManageController.java

@@ -78,7 +78,7 @@ public class LeagueMembersManageController {
 
     @GetMapping(value = "/tree")
     @ApiOperation(value = "团员管理班级附带统计数量列表(树)")
-    @SaCheckPermission("leaguemembersmanage:detail")
+    @SaCheckPermission("leaguemembersmanage:tree")
     @XjrLog(value = "团员管理班级附带统计数量列表(树)")
     public RT<List<ClassWithLMNumTreeVo>> tree() {
         MPJLambdaWrapper<LeagueMembersManage> leagueMembersManageMPJLambdaWrapper = new MPJLambdaWrapper<>();
@@ -166,7 +166,7 @@ public class LeagueMembersManageController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "团员管理列表(分页)")
-    @SaCheckPermission("leaguemembersmanage:detail")
+    @SaCheckPermission("leaguemembersmanage:page")
     @XjrLog(value = "团员管理列表(分页)")
     public RT<PageOutput<LeagueMembersManagePageVo>> page(@Valid LeagueMembersManagePageDto dto) {
         MPJLambdaWrapper<LeagueMembersManage> queryWrapper = new MPJLambdaWrapper<>();
@@ -261,6 +261,7 @@ public class LeagueMembersManageController {
 
     @PostMapping("/league-members-template-download")
     @ApiOperation(value = "团员信息导入模板下载")
+    @SaCheckPermission("leaguemembersmanage:leaguememberstemplatedownload")
     @XjrLog(value = "团员信息导入模板下载")
     public ResponseEntity<byte[]> leagueMembersTemplateDownload() throws IOException {
 //    @GetMapping("/league-members-import-template")
@@ -276,6 +277,7 @@ public class LeagueMembersManageController {
 
     @PostMapping("/import")
     @ApiOperation(value = "团员信息导入")
+    @SaCheckPermission("leaguemembersmanage:import")
     @XjrLog(value = "团员信息导入", saveRequestData = false, saveResponseData = true)
     public RT<Boolean> leagueMembersImport(@Valid @RequestParam MultipartFile file) throws IOException, IllegalAccessException {
         String result = leagueMembersManageService.leagueMembersImport(file);
@@ -287,6 +289,7 @@ public class LeagueMembersManageController {
 
     @PostMapping("/league-members-export-query")
     @ApiOperation(value = "团员信息条件导出")
+    @SaCheckPermission("leaguemembersmanage:leaguemembersexportquery")
     @XjrLog(value = "团员信息条件导出")
     public ResponseEntity<byte[]> leagueMembersExportQuery(@Valid @RequestBody LeagueMembersExportQueryDto dto) throws IOException {
 //    @GetMapping("/league-members-export-query")

+ 5 - 3
src/main/java/com/xjrsoft/module/student/controller/PbCseFeeitem2Controller.java

@@ -39,7 +39,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/student" + "/pbCseFeeitem2")
-@Api(value = "/student" + "/pbCseFeeitem2", tags = "代码")
+@Api(value = "/student" + "/pbCseFeeitem2", tags = "攀宝收费项代码")
 @AllArgsConstructor
 public class PbCseFeeitem2Controller {
 
@@ -48,7 +48,7 @@ public class PbCseFeeitem2Controller {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "列表(分页)")
-    @SaCheckPermission("pbcsefeeitem2:detail")
+    @SaCheckPermission("pbcsefeeitem2:page")
     @XjrLog(value = "列表(分页)")
     public RT<PageOutput<PbCseFeeitem2PageVo>> page(@Valid PbCseFeeitem2PageDto dto) {
 
@@ -63,7 +63,7 @@ public class PbCseFeeitem2Controller {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询信息")
-    @SaCheckPermission("pbcsefeeitem2:detail")
+    @SaCheckPermission("pbcsefeeitem2:info")
     @XjrLog(value = "根据id查询信息", saveResponseData = true)
     public RT<PbCseFeeitem2Vo> info(@RequestParam Long id) {
         PbCseFeeitem2 pbCseFeeitem2 = pbCseFeeitem2Service.getById(id);
@@ -103,6 +103,7 @@ public class PbCseFeeitem2Controller {
 
     @PostMapping("/import")
     @ApiOperation(value = "导入")
+    @SaCheckPermission("pbcsefeeitem2:import")
     @XjrLog(value = "导入", saveRequestData = false, saveResponseData = true)
     public RT<Boolean> importData(@RequestParam MultipartFile file) throws IOException {
         List<PbCseFeeitem2PageVo> savedDataList = EasyExcel.read(file.getInputStream()).head(PbCseFeeitem2PageVo.class).sheet().doReadSync();
@@ -112,6 +113,7 @@ public class PbCseFeeitem2Controller {
 
     @GetMapping("/export")
     @ApiOperation(value = "导出")
+    @SaCheckPermission("pbcsefeeitem2:export")
     @XjrLog(value = "导出")
     public ResponseEntity<byte[]> exportData(@Valid PbCseFeeitem2PageDto dto, @RequestParam(defaultValue = "false") Boolean isTemplate) {
         List<PbCseFeeitem2PageVo> customerList = isTemplate != null && isTemplate ? new ArrayList<>() : page(dto).getData().getList();

+ 9 - 5
src/main/java/com/xjrsoft/module/student/controller/PbCseFeeobjupdateController.java

@@ -57,6 +57,7 @@ public class PbCseFeeobjupdateController {
 
     @GetMapping(value = "/grade-enrolltype-tree")
     @ApiOperation(value = "年级招生类型树")
+    @SaCheckPermission("pbcsefeeobjupdate:gradeenrolltypetree")
     @XjrLog(value = "年级招生类型树")
     public RT<List<GradeEnrolltypeTreeVo>> gradeEnrolltypeTree() {
 
@@ -91,7 +92,7 @@ public class PbCseFeeobjupdateController {
 
     @GetMapping(value = "/enrollment-statistics")
     @ApiOperation(value = "招生统计")
-    @SaCheckPermission("pbcsefeeobjupdate:detail")
+    @SaCheckPermission("pbcsefeeobjupdate:enrollmentstatistics")
     @XjrLog(value = "招生统计", saveResponseData = true)
     public RT<EnrollmentStatisticsInfoVo> getEnrollmentStatisticsInfo(@Valid EnrollmentStatisticsInfoDto dto) {
         EnrollmentStatisticsInfoVo enrollmentStatisticsInfoVo = pbCseFeeobjupdateService.getLastEnrollmentStatisticsInfo(dto);
@@ -100,7 +101,7 @@ public class PbCseFeeobjupdateController {
 
     @GetMapping(value = "/enrollment-statistics-calendar")
     @ApiOperation(value = "招生统计每日动态数据")
-    @SaCheckPermission("pbcsefeeobjupdate:detail")
+    @SaCheckPermission("pbcsefeeobjupdate:enrollmentstatisticscalendar")
     @XjrLog(value = "招生统计每日动态数据", saveResponseData = true)
     public RT<EnrollmentStatisticsCalendarInfoVo> getEnrollmentStatisticsCalendarInfo(@Valid EnrollmentStatisticsCalendarInfoDto dto) {
         EnrollmentStatisticsCalendarInfoVo enrollmentStatisticsCalendarInfoVo = pbCseFeeobjupdateService.getLastEnrollmentStatisticsCalendarInfo(dto);
@@ -109,7 +110,7 @@ public class PbCseFeeobjupdateController {
 
     @GetMapping(value = "/enrollment-statistics-graduation")
     @ApiOperation(value = "招生统计毕业学校数据")
-    @SaCheckPermission("pbcsefeeobjupdate:detail")
+    @SaCheckPermission("pbcsefeeobjupdate:enrollmentstatisticsgraduation")
     @XjrLog(value = "招生统计毕业学校数据", saveResponseData = true)
     public RT<EnrollmentStatisticsGraduationInfoVo> getEnrollmentStatisticsGraduationInfo(@Valid EnrollmentStatisticsGraduationInfoDto dto) {
         EnrollmentStatisticsGraduationInfoVo enrollmentStatisticsGraduationInfoVo = pbCseFeeobjupdateService.getLastEnrollmentStatisticsGraduationInfo(dto);
@@ -118,7 +119,7 @@ public class PbCseFeeobjupdateController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "列表(分页)")
-    @SaCheckPermission("pbcsefeeobjupdate:detail")
+    @SaCheckPermission("pbcsefeeobjupdate:page")
     @XjrLog(value = "列表(分页)")
     public RT<PageOutput<PbCseFeeobjupdatePageVo>> page(@Valid PbCseFeeobjupdatePageDto dto) {
         LambdaQueryWrapper<PbCseFeeobjupdate> queryWrapper = new LambdaQueryWrapper<>();
@@ -133,7 +134,7 @@ public class PbCseFeeobjupdateController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询信息")
-    @SaCheckPermission("pbcsefeeobjupdate:detail")
+    @SaCheckPermission("pbcsefeeobjupdate:info")
     @XjrLog(value = "根据id查询信息", saveResponseData = true)
     public RT<PbCseFeeobjupdateVo> info(@RequestParam Long id) {
         PbCseFeeobjupdate pbCseFeeobjupdate = pbCseFeeobjupdateService.getById(id);
@@ -173,6 +174,7 @@ public class PbCseFeeobjupdateController {
 
     @PostMapping("/import")
     @ApiOperation(value = "导入")
+    @SaCheckPermission("pbcsefeeobjupdate:import")
     @XjrLog(value = "导入", saveRequestData = false, saveResponseData = true)
     public RT<Boolean> importData(@RequestParam MultipartFile file) throws IOException {
         List<PbCseFeeobjupdatePageVo> savedDataList = EasyExcel.read(file.getInputStream()).head(PbCseFeeobjupdatePageVo.class).sheet().doReadSync();
@@ -182,6 +184,7 @@ public class PbCseFeeobjupdateController {
 
     @GetMapping("/export")
     @ApiOperation(value = "导出")
+    @SaCheckPermission("pbcsefeeobjupdate:export")
     @XjrLog(value = "导出")
     public ResponseEntity<byte[]> exportData(@Valid PbCseFeeobjupdatePageDto dto, @RequestParam(defaultValue = "false") Boolean isTemplate) {
         List<PbCseFeeobjupdatePageVo> customerList = isTemplate != null && isTemplate ? new ArrayList<>() : page(dto).getData().getList();
@@ -192,6 +195,7 @@ public class PbCseFeeobjupdateController {
 
     @GetMapping("/enrollment-statistics-start")
     @ApiOperation(value = "触发招生统计")
+    @SaCheckPermission("pbcsefeeobjupdate:enrollmentstatisticsstart")
     @XjrLog(value = "触发招生统计")
     public RT<Boolean> exportData() {
         EnrollmentStatisticsInfoTask statisticsInfoTask = new EnrollmentStatisticsInfoTask();

+ 3 - 3
src/main/java/com/xjrsoft/module/student/controller/PbCseSpecplanController.java

@@ -32,7 +32,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/student" + "/pbCseSpecplan")
-@Api(value = "/student" + "/pbCseSpecplan", tags = "代码")
+@Api(value = "/student" + "/pbCseSpecplan", tags = "攀宝招生计划代码")
 @AllArgsConstructor
 public class PbCseSpecplanController {
 
@@ -41,7 +41,7 @@ public class PbCseSpecplanController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "列表(分页)")
-    @SaCheckPermission("pbcsespecplan:detail")
+    @SaCheckPermission("pbcsespecplan:page")
     @XjrLog(value = "列表(分页)")
     public RT<PageOutput<PbCseSpecplanPageVo>> page(@Valid PbCseSpecplanPageDto dto) {
 
@@ -56,7 +56,7 @@ public class PbCseSpecplanController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询信息")
-    @SaCheckPermission("pbcsespecplan:detail")
+    @SaCheckPermission("pbcsespecplan:info")
     @XjrLog(value = "根据id查询信息", saveResponseData = true)
     public RT<PbCseSpecplanVo> info(@RequestParam Long id) {
         PbCseSpecplan pbCseSpecplan = pbCseSpecplanService.getById(id);

+ 3 - 3
src/main/java/com/xjrsoft/module/student/controller/PbSemesterConfigController.java

@@ -45,7 +45,7 @@ public class PbSemesterConfigController {
 
     @GetMapping(value = "/tree")
     @ApiOperation(value = "年和学期树")
-    @SaCheckPermission("pbsemesterconfig:detail")
+    @SaCheckPermission("pbsemesterconfig:tree")
     @XjrLog(value = "年和学期树")
     public RT<List<SemesterYeatTreeVo>> tree() {
         LambdaQueryWrapper<BaseSemester> baseSemesterLambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -83,7 +83,7 @@ public class PbSemesterConfigController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "攀宝学期对应列表(分页)")
-    @SaCheckPermission("pbsemesterconfig:detail")
+    @SaCheckPermission("pbsemesterconfig:page")
     @XjrLog(value = "攀宝学期对应列表(分页)")
     public RT<PageOutput<PbSemesterConfigPageVo>> page(@Valid PbSemesterConfigPageDto dto) {
 
@@ -99,7 +99,7 @@ public class PbSemesterConfigController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询攀宝学期对应信息")
-    @SaCheckPermission("pbsemesterconfig:detail")
+    @SaCheckPermission("pbsemesterconfig:info")
     @XjrLog(value = "根据id查询攀宝学期对应信息", saveResponseData = true)
     public RT<PbSemesterConfigVo> info(@RequestParam Long id) {
         PbSemesterConfig pbSemesterConfig = pbSemesterConfigService.getById(id);

+ 2 - 2
src/main/java/com/xjrsoft/module/student/controller/QuotaFormulaRuleAttributeController.java

@@ -39,7 +39,7 @@ public class QuotaFormulaRuleAttributeController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "考核表单属性列表(分页)")
-    @SaCheckPermission("quotaformularuleattribute:detail")
+    @SaCheckPermission("quotaformularuleattribute:page")
     @XjrLog(value = "考核表单属性列表(分页)")
     public RT<PageOutput<QuotaFormulaRuleAttributePageVo>> page(@Valid QuotaFormulaRuleAttributePageDto dto) {
 
@@ -50,7 +50,7 @@ public class QuotaFormulaRuleAttributeController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询考核表单属性信息")
-    @SaCheckPermission("quotaformularuleattribute:detail")
+    @SaCheckPermission("quotaformularuleattribute:info")
     @XjrLog(value = "根据id查询考核表单属性信息", saveResponseData = true)
     public RT<QuotaFormulaRuleAttributeVo> info(@RequestParam Long id) {
         QuotaFormulaRuleAttribute quotaFormulaRuleAttribute = quotaFormulaRuleAttributeService.getById(id);

+ 2 - 2
src/main/java/com/xjrsoft/module/student/controller/QuotaFormulaRuleConstantController.java

@@ -39,7 +39,7 @@ public class QuotaFormulaRuleConstantController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "考核基数列表(分页)")
-    @SaCheckPermission("quotaformularuleconstant:detail")
+    @SaCheckPermission("quotaformularuleconstant:page")
     @XjrLog(value = "考核基数列表(分页)")
     public RT<PageOutput<QuotaFormulaRuleConstantPageVo>> page(@Valid QuotaFormulaRuleConstantPageDto dto) {
         Page<QuotaFormulaRuleConstantPageVo> page = quotaFormulaRuleConstantService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
@@ -49,7 +49,7 @@ public class QuotaFormulaRuleConstantController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询考核基数信息")
-    @SaCheckPermission("quotaformularuleconstant:detail")
+    @SaCheckPermission("quotaformularuleconstant:info")
     @XjrLog(value = "根据id查询考核基数信息", saveResponseData = true)
     public RT<QuotaFormulaRuleConstantVo> info(@RequestParam Long id) {
         QuotaFormulaRuleConstant quotaFormulaRuleConstant = quotaFormulaRuleConstantService.getById(id);

Неке датотеке нису приказане због велике количине промена