From a0554e47fd781020447114f3938bfdeef96c4d7b Mon Sep 17 00:00:00 2001 From: lg Date: Sat, 15 Nov 2025 17:21:40 +0800 Subject: [PATCH] zuyin --- .../controller/XzdCsContractChangeController.java | 3 ++- .../controller/XzdCsContractSuspendController.java | 3 ++- .../costBudget/controller/XzdCbysJdcbfjController.java | 3 ++- .../controller/XzdCbysZjhcbAlterationController.java | 3 ++- .../paymentsReceipts/controller/XzdSfkCaigouFkController.java | 3 ++- .../controller/XzdSfkZonhefuwuFkController.java | 3 ++- .../xzd/settlement/controller/XzdJsCgJinduController.java | 3 ++- .../xzd/settlement/controller/XzdJsCgJungonController.java | 3 ++- .../xzd/settlement/controller/XzdJsCgJungonEditController.java | 3 ++- .../xzd/settlement/controller/XzdJsZhfwJinduController.java | 3 ++- .../SettlementOfSubcontractingContractController.java | 2 +- 11 files changed, 21 insertions(+), 11 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractChangeController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractChangeController.java index 21eb995f..e31bb246 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractChangeController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractChangeController.java @@ -2,6 +2,7 @@ package org.dromara.xzd.comprehensive.controller; import java.util.List; +import cn.dev33.satoken.annotation.SaMode; import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; @@ -113,7 +114,7 @@ public class XzdCsContractChangeController extends BaseController { /** * 查询综合服务合同信息列表 */ - @SaCheckPermission("comprehensive:csContractChange:add || comprehensive:csContractChange:edit || comprehensive:csContractChange:list") + @SaCheckPermission(value = {"comprehensive:csContractChange:add","comprehensive:csContractChange:edit","comprehensive:csContractChange:list"},mode = SaMode.OR) @GetMapping("/getList") public TableDataInfo getList(XzdCsContractInformationBo bo, PageQuery pageQuery) { return xzdCsContractInformationService.queryPageList(bo, pageQuery); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractSuspendController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractSuspendController.java index d5d1e6bc..5a3bcdef 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractSuspendController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractSuspendController.java @@ -2,6 +2,7 @@ package org.dromara.xzd.comprehensive.controller; import java.util.List; +import cn.dev33.satoken.annotation.SaMode; import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; @@ -113,7 +114,7 @@ public class XzdCsContractSuspendController extends BaseController { /** * 查询综合服务合同信息列表 */ - @SaCheckPermission("comprehensive:csContractSuspend:add || comprehensive:csContractSuspend:edit || comprehensive:csContractSuspend:list") + @SaCheckPermission(value = {"comprehensive:csContractSuspend:add","comprehensive:csContractSuspend:edit","comprehensive:csContractSuspend:list"},mode = SaMode.OR) @GetMapping("/getList") public TableDataInfo getList(XzdCsContractInformationBo bo, PageQuery pageQuery) { return xzdCsContractInformationService.queryPageList(bo, pageQuery); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysJdcbfjController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysJdcbfjController.java index 1b13197b..9f71284d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysJdcbfjController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysJdcbfjController.java @@ -2,6 +2,7 @@ package org.dromara.xzd.costProjectApproval.costBudget.controller; import java.util.List; +import cn.dev33.satoken.annotation.SaMode; import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; @@ -46,7 +47,7 @@ public class XzdCbysJdcbfjController extends BaseController { /** * 查询立项及成本-成本预算-总体计划成本列表 */ - @SaCheckPermission("costBudget:cbysJdcbfj:add || costBudget:cbysJdcbfj:edit || costBudget:cbysJdcbfj:list") + @SaCheckPermission(value = {"costBudget:cbysJdcbfj:add","costBudget:cbysJdcbfj:edit","costBudget:cbysJdcbfj:list"}, mode = SaMode.OR) @GetMapping("/getList") public TableDataInfo list(XzdCbysZjhcbBo bo, PageQuery pageQuery) { return xzdCbysZjhcbService.queryPageList(bo, pageQuery); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysZjhcbAlterationController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysZjhcbAlterationController.java index f59c8299..a4be11f1 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysZjhcbAlterationController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysZjhcbAlterationController.java @@ -2,6 +2,7 @@ package org.dromara.xzd.costProjectApproval.costBudget.controller; import java.util.List; +import cn.dev33.satoken.annotation.SaMode; import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; @@ -47,7 +48,7 @@ public class XzdCbysZjhcbAlterationController extends BaseController { /** * 查询立项及成本-成本预算-总体计划成本列表 */ - @SaCheckPermission("costBudget:cbysZjhcbAlteration:add || costBudget:cbysZjhcbAlteration:edit || costBudget:cbysZjhcbAlteration:list") + @SaCheckPermission(value = {"costBudget:cbysZjhcbAlteration:add","costBudget:cbysZjhcbAlteration:edit","costBudget:cbysZjhcbAlteration:list"},mode = SaMode.OR) @GetMapping("/getList") public TableDataInfo list(XzdCbysZjhcbBo bo, PageQuery pageQuery) { return xzdCbysZjhcbService.queryPageList(bo, pageQuery); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkCaigouFkController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkCaigouFkController.java index 371a74ce..7cf647f0 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkCaigouFkController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkCaigouFkController.java @@ -2,6 +2,7 @@ package org.dromara.xzd.paymentsReceipts.controller; import java.util.List; +import cn.dev33.satoken.annotation.SaMode; import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; @@ -46,7 +47,7 @@ public class XzdSfkCaigouFkController extends BaseController { /** * 查询采购合同信息列表 */ - @SaCheckPermission("paymentsReceipts:sfkCaigouFk:list || paymentsReceipts:sfkCaigouFk:add || paymentsReceipts:sfkCaigouFk:edit") + @SaCheckPermission(value = {"paymentsReceipts:sfkCaigouFk:list","paymentsReceipts:sfkCaigouFk:add","paymentsReceipts:sfkCaigouFk:edit"},mode = SaMode.OR) @GetMapping("/getList") public TableDataInfo list(XzdPurchaseContractInformationBo bo, PageQuery pageQuery) { return xzdPurchaseContractInformationService.queryPageList(bo, pageQuery); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkZonhefuwuFkController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkZonhefuwuFkController.java index 71579521..1a972bb7 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkZonhefuwuFkController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkZonhefuwuFkController.java @@ -2,6 +2,7 @@ package org.dromara.xzd.paymentsReceipts.controller; import java.util.List; +import cn.dev33.satoken.annotation.SaMode; import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; @@ -48,7 +49,7 @@ public class XzdSfkZonhefuwuFkController extends BaseController { /** * 查询综合服务合同信息列表 */ - @SaCheckPermission("settlement:jsZhfwJindu:add || settlement:jsZhfwJindu:edit || settlement:jsZhfwJindu:list") + @SaCheckPermission(value = {"settlement:jsZhfwJindu:add","settlement:jsZhfwJindu:edit","settlement:jsZhfwJindu:list"},mode = SaMode.OR) @GetMapping("/getList") public TableDataInfo getList(XzdCsContractInformationBo bo, PageQuery pageQuery) { return xzdCsContractInformationService.queryPageList(bo, pageQuery); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJinduController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJinduController.java index e3fec948..73236303 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJinduController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJinduController.java @@ -2,6 +2,7 @@ package org.dromara.xzd.settlement.controller; import java.util.List; +import cn.dev33.satoken.annotation.SaMode; import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; @@ -45,7 +46,7 @@ public class XzdJsCgJinduController extends BaseController { /** * 查询采购合同信息列表 */ - @SaCheckPermission("settlement:jsCgJindu:list || settlement:jsCgJindu:add || settlement:jsCgJindu:edit") + @SaCheckPermission(value = {"settlement:jsCgJindu:list","settlement:jsCgJindu:add","settlement:jsCgJindu:edit"}, mode = SaMode.OR) @GetMapping("/getList") public TableDataInfo list(XzdPurchaseContractInformationBo bo, PageQuery pageQuery) { return xzdPurchaseContractInformationService.queryPageList(bo, pageQuery); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonController.java index 2023fcc8..cb7c1c5c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonController.java @@ -2,6 +2,7 @@ package org.dromara.xzd.settlement.controller; import java.util.List; +import cn.dev33.satoken.annotation.SaMode; import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; @@ -47,7 +48,7 @@ public class XzdJsCgJungonController extends BaseController { /** * 查询采购合同信息列表 */ - @SaCheckPermission("settlement:jsCgJungon:list || settlement:jsCgJungon:add || settlement:jsCgJungon:edit") + @SaCheckPermission(value = {"settlement:jsCgJungon:list","settlement:jsCgJungon:add","settlement:jsCgJungon:edit"},mode = SaMode.OR) @GetMapping("/getList") public TableDataInfo list(XzdPurchaseContractInformationBo bo, PageQuery pageQuery) { return xzdPurchaseContractInformationService.queryPageList(bo, pageQuery); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonEditController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonEditController.java index e0855a93..7d9e77e8 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonEditController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonEditController.java @@ -1,6 +1,7 @@ package org.dromara.xzd.settlement.controller; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; @@ -47,7 +48,7 @@ public class XzdJsCgJungonEditController extends BaseController { /** * 查询采购合同竣工结算列表 */ - @SaCheckPermission("settlement:jsCgJungonEdit:list || settlement:jsCgJungonEdit:add || settlement:jsCgJungonEdit:edit") + @SaCheckPermission(value = {"settlement:jsCgJungonEdit:list","settlement:jsCgJungonEdit:add","settlement:jsCgJungonEdit:edit"},mode = SaMode.OR) @GetMapping("/list") public TableDataInfo list(XzdJsCgJungonBo bo, PageQuery pageQuery) { return xzdJsCgJungonService.queryPageList(bo, pageQuery); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsZhfwJinduController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsZhfwJinduController.java index c7b38003..50f2e435 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsZhfwJinduController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsZhfwJinduController.java @@ -2,6 +2,7 @@ package org.dromara.xzd.settlement.controller; import java.util.List; +import cn.dev33.satoken.annotation.SaMode; import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; @@ -113,7 +114,7 @@ public class XzdJsZhfwJinduController extends BaseController { /** * 查询综合服务合同信息列表 */ - @SaCheckPermission("settlement:jsZhfwJindu:add || settlement:jsZhfwJindu:edit || settlement:jsZhfwJindu:list") + @SaCheckPermission(value = {"settlement:jsZhfwJindu:add","settlement:jsZhfwJindu:edit","settlement:jsZhfwJindu:list"},mode = SaMode.OR) @GetMapping("/getList") public TableDataInfo getList(XzdCsContractInformationBo bo, PageQuery pageQuery) { return xzdCsContractInformationService.queryPageList(bo, pageQuery); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjingdu/controller/SettlementOfSubcontractingContractController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjingdu/controller/SettlementOfSubcontractingContractController.java index b0efc4a5..0ec3d0f9 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjingdu/controller/SettlementOfSubcontractingContractController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjingdu/controller/SettlementOfSubcontractingContractController.java @@ -45,7 +45,7 @@ public class SettlementOfSubcontractingContractController extends BaseController /** * 查询分包合同信息列表 */ - @SaCheckPermission(value = {"fenbaohetongjingdu:ofSubcontractingContract:list "," fenbaohetongjingdu:ofSubcontractingContract:add "," fenbaohetongjingdu:ofSubcontractingContract:edit"},mode = SaMode.OR) + @SaCheckPermission(value = {"fenbaohetongjingdu:ofSubcontractingContract:list","fenbaohetongjingdu:ofSubcontractingContract:add","fenbaohetongjingdu:ofSubcontractingContract:edit"},mode = SaMode.OR) @GetMapping("/getlist") public TableDataInfo list(XzdSubcontractBo bo, PageQuery pageQuery) { return xzdSubcontractService.queryPageList(bo, pageQuery);