Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4
This commit is contained in:
+5
-4
@@ -1,6 +1,7 @@
|
||||
package com.budwk.app.zhgh.staffbenefit.benefiting.controller;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import cn.dev33.satoken.annotation.SaMode;
|
||||
import com.budwk.app.base.page.Pagination;
|
||||
import com.budwk.app.base.param.PageForm;
|
||||
import com.budwk.app.base.result.Result;
|
||||
@@ -47,7 +48,7 @@ public class BenefitingProjectManageController {
|
||||
|
||||
|
||||
@At
|
||||
@SaCheckPermission(value = {"benefiting.manage","benefiting.list"})
|
||||
@SaCheckPermission(value = {"benefiting.manage", "benefiting.list"}, mode = SaMode.OR)
|
||||
public Result pageData(PageForm pageForm,Integer year,String projectName) {
|
||||
Sql sql = Sqls.create("""
|
||||
select * from benefiting_project $condition
|
||||
@@ -63,7 +64,7 @@ public class BenefitingProjectManageController {
|
||||
|
||||
|
||||
@At
|
||||
@SaCheckPermission("benefiting.manage")
|
||||
@SaCheckPermission(value = {"benefiting.manage", "benefiting.list"}, mode = SaMode.OR)
|
||||
public Result doSubmit(BenefitingProject benefitingProject) {
|
||||
benefitingProject.setCreateTime(new Date());
|
||||
baseService.insertOrUpdate(benefitingProject);
|
||||
@@ -72,7 +73,7 @@ public class BenefitingProjectManageController {
|
||||
|
||||
|
||||
@At
|
||||
@SaCheckPermission("benefiting.manage")
|
||||
@SaCheckPermission(value = {"benefiting.manage", "benefiting.list"}, mode = SaMode.OR)
|
||||
public Result doDelete(String id) {
|
||||
baseService.dao().delete(BenefitingProject.class, id);
|
||||
return Result.success();
|
||||
@@ -80,7 +81,7 @@ public class BenefitingProjectManageController {
|
||||
|
||||
|
||||
@At
|
||||
@SaCheckPermission("benefiting.manage")
|
||||
@SaCheckPermission(value = {"benefiting.manage", "benefiting.list"}, mode = SaMode.OR)
|
||||
public Result findOne(String id) {
|
||||
BenefitingProject project = baseService.dao().fetch(BenefitingProject.class, id);
|
||||
return Result.success(project);
|
||||
|
||||
Reference in New Issue
Block a user