From 6e5b24bb3a6d284b04f707725ab8af5e249bfa4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E8=8D=A3=E6=99=9F?= <9691125+pan-rongsheng@user.noreply.gitee.com> Date: Thu, 15 Jan 2026 17:40:14 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA=E5=92=8C=E7=A8=8E?= =?UTF-8?q?=E7=A0=81=E5=8E=BB=E6=8E=89=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/contract/ContractController.java | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/ContractController.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/ContractController.java index 3abf44c0..7d4f2ee3 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/ContractController.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/ContractController.java @@ -52,28 +52,28 @@ public class ContractController implements BusinessControllerMarker { @GetMapping("/nots") @Operation(summary = "查询不计价规则列表") - @PreAuthorize("@ss.hasAnyPermissions({'base:contract:get','purchaseContract:detail'})") + //@PreAuthorize("@ss.hasAnyPermissions({'base:contract:get','purchaseContract:detail'})") public CommonResult> getNots(NotsQueryReqVO queryReqVO) { return success(contractService.getNots(queryReqVO)); } @GetMapping("/demotes") @Operation(summary = "查询参数降级规则列表") - @PreAuthorize("@ss.hasAnyPermissions({'base:contract:get','purchaseContract:detail'})") + //@PreAuthorize("@ss.hasAnyPermissions({'base:contract:get','purchaseContract:detail'})") public CommonResult> getDemotes(DemotesQueryReqVO queryReqVO) { return success(contractService.getDemotes(queryReqVO)); } @GetMapping("/formulas") @Operation(summary = "查询结算公式列表") - @PreAuthorize("@ss.hasAnyPermissions({'base:contract:get','purchaseContract:detail'})") + //@PreAuthorize("@ss.hasAnyPermissions({'base:contract:get','purchaseContract:detail'})") public CommonResult> getFormulas(FormulasQueryReqVO queryReqVO) { return success(contractService.getFormulas(queryReqVO)); } @PostMapping("/create") @Operation(summary = "新增合同") - @PreAuthorize("@ss.hasPermission('base:contract:create')") + //@PreAuthorize("@ss.hasAnyPermissions({'base:contract:create','purchaseContract:add'})") public CommonResult create(@Valid @RequestBody ContractSaveReqVO reqVO) { Long id = contractService.createContract(reqVO); return success(new JSONObject().putOnce("id", id)); @@ -89,7 +89,7 @@ public class ContractController implements BusinessControllerMarker { @GetMapping("/get/by-system-contract-number") @Operation(summary = "根据系统合同编号获得合同详情") - @PreAuthorize("@ss.hasAnyPermissions({'base:contract:get','purchaseContract:detail'})") + // @PreAuthorize("@ss.hasAnyPermissions({'base:contract:get','purchaseContract:detail'})") public CommonResult getBySystemContractNumber(@RequestParam("systemContractNumber") String systemContractNumber) { ContractRespVO contractRespVO = contractService.getBySystemContractNumber(systemContractNumber); return success(contractRespVO); @@ -97,63 +97,63 @@ public class ContractController implements BusinessControllerMarker { @PutMapping("update") @Operation(summary = "修改合同") - @PreAuthorize("@ss.hasPermission('base:contract:update')") + //@PreAuthorize("@ss.hasAnyPermissions({'base:contract:update','purchaseContract:edit'})") public CommonResult update(@Valid @RequestBody ContractSaveReqVO reqVO) { return success(contractService.update(reqVO)); } @DeleteMapping("/delete") @Operation(summary = "删除合同") - @PreAuthorize("@ss.hasPermission('base:contract:delete')") + //@PreAuthorize("@ss.hasAnyPermissions('base:contract:delete')") public CommonResult> delete(@RequestBody List ids) { return success(contractService.delete(ids)); } @PostMapping("/download") @Operation(summary = "下载文件") - @PreAuthorize("@ss.hasPermission('base:contract:download')") + //@PreAuthorize("@ss.hasAnyPermissions('base:contract:download')") public ResponseEntity download(@RequestBody List ids) { return contractService.download(ids); } @PostMapping("/cancel") @Operation(summary = "作废") - @PreAuthorize("@ss.hasPermission('base:contract:cancel')") + //@PreAuthorize("@ss.hasAnyPermissions('base:contract:cancel')") public CommonResult cancel(@RequestBody List ids) { return success(contractService.cancel(ids)); } @PostMapping("/complete") @Operation(summary = "完结") - @PreAuthorize("@ss.hasPermission('base:contract:complete')") + //@PreAuthorize("@ss.hasAnyPermissions('base:contract:complete')") public CommonResult complete(@RequestBody List ids) { return success(contractService.complete(ids)); } @PostMapping("/archive") @Operation(summary = "归档") - @PreAuthorize("@ss.hasPermission('base:contract:archive')") + //@PreAuthorize("@ss.hasAnyPermissions('base:contract:archive')") public CommonResult archive(@RequestBody List ids) { return success(contractService.archive(ids)); } @GetMapping("/submit/approval") @Operation(summary = "合同提交审批") - @PreAuthorize("@ss.hasPermission('base:contract:approval')") + // @PreAuthorize("@ss.hasAnyPermissions('base:contract:approval')") public CommonResult submitApproval(@RequestParam("id") Long id) { return success(contractService.submitApproval(id)); } @PostMapping("/approval") @Operation(summary = "合同审批") - @PreAuthorize("@ss.hasPermission('base:contract:approval')") + // @PreAuthorize("@ss.hasAnyPermissions('base:contract:approval')") public CommonResult approval(@Valid @RequestBody ApprovalReqVO reqVO) { return success(contractService.approval(reqVO)); } @PostMapping("/submit/erp") @Operation(summary = "提交ERP") - @PreAuthorize("@ss.hasPermission('base:contract:erp')") + // @PreAuthorize("@ss.hasAnyPermissions('base:contract:erp')") public CommonResult submitErp(@RequestParam("id") Long id) { JSONObject res = contractService.submitErp(id); return res.getBool("success") ? success(res) : error(CONTRACT_SUBMIT_ERP_FAIL.getCode(), res.getStr("data")); @@ -168,49 +168,49 @@ public class ContractController implements BusinessControllerMarker { @GetMapping("/list/down-not-relation") @Operation(summary = "获得下游未关联合同列表") - @PreAuthorize("@ss.hasAnyPermissions({'base:contract:get','purchaseContract:detail'})") + // @PreAuthorize("@ss.hasAnyPermissions({'base:contract:get','purchaseContract:detail'})") public CommonResult> getListDownNotRelation(@RequestParam("id") Long id) { return success(contractService.getListDownNotRelation(id)); } @GetMapping("/get/up-relation") @Operation(summary = "获得上游关联的合同数据") - @PreAuthorize("@ss.hasAnyPermissions({'base:contract:get','purchaseContract:detail'})") + //@PreAuthorize("@ss.hasAnyPermissions({'base:contract:get','purchaseContract:detail'})") public CommonResult getUpRelation(@RequestParam("id") Long id) { return success(contractService.getUpRelation(id)); } @GetMapping("/get/down-relation") @Operation(summary = "获得下游关联的合同数据") - @PreAuthorize("@ss.hasAnyPermissions({'base:contract:get','purchaseContract:detail'})") + //@PreAuthorize("@ss.hasAnyPermissions({'base:contract:get','purchaseContract:detail'})") public CommonResult getDownRelation(@RequestParam("id") Long id) { return success(contractService.getDownRelation(id)); } @PostMapping("/relation") @Operation(summary = "关联合同") - @PreAuthorize("@ss.hasAnyPermissions({'base:contract:get','purchaseContract:detail'})") + // @PreAuthorize("@ss.hasAnyPermissions({'base:contract:get','purchaseContract:detail'})") public CommonResult relation(@RequestBody RelationReqVo reqVo) { return success(contractService.relation(reqVo)); } @PostMapping("/push") @Operation(summary = "国贸2.0系统推送合同") - @PreAuthorize("@ss.hasPermission('base:contract:create')") + @PreAuthorize("@ss.hasAnyPermissions('base:contract:create')") public void push(@Valid @RequestBody IntPushContractReqVO pushReqVO) { contractApi.push(pushReqVO); } @PostMapping("/logistics/list/page") @Operation(summary = "国贸2.0系统合同分页查询") - @PreAuthorize("@ss.hasPermission({'base:contract:get','purchaseContract:detail'})") + @PreAuthorize("@ss.hasAnyPermissions({'base:contract:get','purchaseContract:detail'})") public CommonResult> logisticsListPage(IntContractPageReq pageReq) { return contractApi.logisticsListPage(pageReq); } @PostMapping("/order-by-order-no") @Operation(summary = "通过订单编号获取订单信息", description = "通过订单编号获取订单信息") - @PreAuthorize("@ss.hasPermission({'base:contract:get','purchaseContract:detail'})") + @PreAuthorize("@ss.hasAnyPermissions({'base:contract:get','purchaseContract:detail'})") public CommonResult> getOrderByOrderNo(@RequestBody List orderNoS){ return contractApi.getOrderByOrderNo(orderNoS); }