This commit is contained in:
2026-06-18 17:53:54 +08:00
parent 47e971ebc8
commit 702615c59f
3 changed files with 60 additions and 12 deletions
@@ -77,7 +77,7 @@ public class TourBranchUserAssignmentController {
* 分页查询候选人员,候选范围由疗休养配置可参加人员范围和当前登录人所在分工会共同决定;userIds 仅作为人员选择器筛选条件。
*/
@At
@SaCheckPermission("tour.branchUserAssignment")
@SaCheckPermission("tour.branchUserAssignment.assign")
public Result candidatePageData(PageForm pageForm, String settingId, String keyword, @Param("userIds") String userIds) {
return Result.success(tourUserAssignmentService.branchCandidatePage(pageForm, settingId, keyword, parseUserIds(userIds)));
}
@@ -104,7 +104,7 @@ public class TourBranchUserAssignmentController {
* 查询当前登录人所在分工会在指定配置下的名额使用情况。
*/
@At
@SaCheckPermission("tour.branchUserAssignment")
@SaCheckPermission("tour.branchUserAssignment.assign")
public Result quotaInfo(String settingId) {
return Result.success(tourUserAssignmentService.branchQuotaInfo(settingId));
}
@@ -114,7 +114,7 @@ public class TourBranchUserAssignmentController {
*/
@At
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission("tour.branchUserAssignment")
@SaCheckPermission("tour.branchUserAssignment.assign")
@SLog(type = "tour", tag = "疗休养分工会人员分配", msg = "保存分工会人员分配")
public Result doAssign(String settingId, String matterId, String personType, @Param("userIds") String userIds) {
List<String> parsedUserIds;
@@ -135,7 +135,7 @@ public class TourBranchUserAssignmentController {
*/
@At
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission("tour.branchUserAssignment")
@SaCheckPermission("tour.branchUserAssignment.switchPersonType")
@SLog(type = "tour", tag = "疗休养分工会人员分配", msg = "切换分工会人员类型")
public Result switchPersonType(String id, String personType) {
try {
@@ -150,7 +150,7 @@ public class TourBranchUserAssignmentController {
*/
@At
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission("tour.branchUserAssignment")
@SaCheckPermission("tour.branchUserAssignment.selectMatter")
@SLog(type = "tour", tag = "疗休养分工会人员分配", msg = "选择分工会分配事项")
public Result selectMatter(String id, String matterId) {
try {
@@ -180,7 +180,7 @@ public class TourBranchUserAssignmentController {
* 删除前检查该分配记录是否已经存在对应报名台账。
*/
@At
@SaCheckPermission("tour.branchUserAssignment")
@SaCheckPermission("tour.branchUserAssignment.delete")
public Result deleteInfo(String id) {
if (StrUtil.isBlank(id)) {
return Result.error("参数错误");
@@ -193,7 +193,7 @@ public class TourBranchUserAssignmentController {
*/
@At
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission("tour.branchUserAssignment")
@SaCheckPermission("tour.branchUserAssignment.delete")
@SLog(type = "tour", tag = "疗休养分工会人员分配", msg = "删除分工会人员分配")
public Result doDelete(String id, Boolean deleteLedger) {
if (StrUtil.isBlank(id)) {