联系人和税码去掉权限

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/ContractController.java

@@ -44,7 +44,7 @@ public class ContractController implements BusinessControllerMarker {
 
     @GetMapping("/page")
     @Operation(summary = "获得合同分页列表")
-    @PreAuthorize("@ss.hasPermission('base:contract:query')")
+    @PreAuthorize("@ss.hasAnyPermissions({'base:contract:get','purchaseContract:detail'})")
     public CommonResult<PageResult<ContractRespVO>> getPage(@Valid ContractPageReqVO pageReqVO) {
         PageResult<ContractMainDO> pageResult = contractService.getContractPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, ContractRespVO.class));
@@ -52,21 +52,21 @@ public class ContractController implements BusinessControllerMarker {
 
     @GetMapping("/nots")
     @Operation(summary = "查询不计价规则列表")
-    @PreAuthorize("@ss.hasPermission('base:contract:query')")
+    @PreAuthorize("@ss.hasAnyPermissions({'base:contract:get','purchaseContract:detail'})")
     public CommonResult<PageResult<NotRespVO>> getNots(NotsQueryReqVO queryReqVO) {
         return success(contractService.getNots(queryReqVO));
     }
 
     @GetMapping("/demotes")
     @Operation(summary = "查询参数降级规则列表")
-    @PreAuthorize("@ss.hasPermission('base:contract:query')")
+    @PreAuthorize("@ss.hasAnyPermissions({'base:contract:get','purchaseContract:detail'})")
     public CommonResult<PageResult<DemoteRespVO>> getDemotes(DemotesQueryReqVO queryReqVO) {
         return success(contractService.getDemotes(queryReqVO));
     }
 
     @GetMapping("/formulas")
     @Operation(summary = "查询结算公式列表")
-    @PreAuthorize("@ss.hasPermission('base:contract:query')")
+    @PreAuthorize("@ss.hasAnyPermissions({'base:contract:get','purchaseContract:detail'})")
     public CommonResult<PageResult<FormulaRespVO>> getFormulas(FormulasQueryReqVO queryReqVO) {
         return success(contractService.getFormulas(queryReqVO));
     }
@@ -81,7 +81,7 @@ public class ContractController implements BusinessControllerMarker {
 
     @GetMapping("/get")
     @Operation(summary = "获得合同详情")
-    @PreAuthorize("@ss.hasPermission('base:contract:get')")
+    @PreAuthorize("@ss.hasAnyPermissions({'base:contract:get','purchaseContract:detail'})")
     public CommonResult<ContractRespVO> get(@RequestParam("id") Long id) {
         ContractRespVO contractRespVO = contractService.get(id);
         return success(contractRespVO);
@@ -89,7 +89,7 @@ public class ContractController implements BusinessControllerMarker {
 
     @GetMapping("/get/by-system-contract-number")
     @Operation(summary = "根据系统合同编号获得合同详情")
-    @PreAuthorize("@ss.hasPermission('base:contract:get')")
+    @PreAuthorize("@ss.hasAnyPermissions({'base:contract:get','purchaseContract:detail'})")
     public CommonResult<ContractRespVO> getBySystemContractNumber(@RequestParam("systemContractNumber") String systemContractNumber) {
         ContractRespVO contractRespVO = contractService.getBySystemContractNumber(systemContractNumber);
         return success(contractRespVO);
@@ -161,35 +161,35 @@ public class ContractController implements BusinessControllerMarker {
 
     @GetMapping("/list/up-not-relation")
     @Operation(summary = "获得上游未关联合同列表")
-    @PreAuthorize("@ss.hasPermission('base:contract:relation')")
+    @PreAuthorize("@ss.hasAnyPermissions({'base:contract:get','purchaseContract:detail'})")
     public CommonResult<List<ContractRespVO>> getListUpNotRelation(@RequestParam("id") Long id) {
         return success(contractService.getListUpNotRelation(id));
     }
 
     @GetMapping("/list/down-not-relation")
     @Operation(summary = "获得下游未关联合同列表")
-    @PreAuthorize("@ss.hasPermission('base:contract:relation')")
+    @PreAuthorize("@ss.hasAnyPermissions({'base:contract:get','purchaseContract:detail'})")
     public CommonResult<List<ContractRespVO>> getListDownNotRelation(@RequestParam("id") Long id) {
         return success(contractService.getListDownNotRelation(id));
     }
 
     @GetMapping("/get/up-relation")
     @Operation(summary = "获得上游关联的合同数据")
-    @PreAuthorize("@ss.hasPermission('base:contract:relation')")
+    @PreAuthorize("@ss.hasAnyPermissions({'base:contract:get','purchaseContract:detail'})")
     public CommonResult<ContractRespVO> getUpRelation(@RequestParam("id") Long id) {
         return success(contractService.getUpRelation(id));
     }
 
     @GetMapping("/get/down-relation")
     @Operation(summary = "获得下游关联的合同数据")
-    @PreAuthorize("@ss.hasPermission('base:contract:relation')")
+    @PreAuthorize("@ss.hasAnyPermissions({'base:contract:get','purchaseContract:detail'})")
     public CommonResult<ContractRespVO> getDownRelation(@RequestParam("id") Long id) {
         return success(contractService.getDownRelation(id));
     }
 
     @PostMapping("/relation")
     @Operation(summary = "关联合同")
-    @PreAuthorize("@ss.hasPermission('base:contract:relation')")
+    @PreAuthorize("@ss.hasAnyPermissions({'base:contract:get','purchaseContract:detail'})")
     public CommonResult<Boolean> relation(@RequestBody RelationReqVo reqVo) {
         return success(contractService.relation(reqVo));
     }
@@ -203,21 +203,21 @@ public class ContractController implements BusinessControllerMarker {
 
     @PostMapping("/logistics/list/page")
     @Operation(summary = "国贸2.0系统合同分页查询")
-    @PreAuthorize("@ss.hasPermission('base:contract:query')")
+    @PreAuthorize("@ss.hasPermission({'base:contract:get','purchaseContract:detail'})")
     public CommonResult<PageResult<IntContract>> logisticsListPage(IntContractPageReq pageReq) {
         return contractApi.logisticsListPage(pageReq);
     }
 
     @PostMapping("/order-by-order-no")
     @Operation(summary = "通过订单编号获取订单信息", description = "通过订单编号获取订单信息")
-    @PreAuthorize("@ss.hasPermission('base:contract:query')")
+    @PreAuthorize("@ss.hasPermission({'base:contract:get','purchaseContract:detail'})")
     public CommonResult<List<PurchaseOrderWithDetailsDTO>> getOrderByOrderNo(@RequestBody List<String> orderNoS){
         return contractApi.getOrderByOrderNo(orderNoS);
     }
 
     @GetMapping("/transaction-info/by-paper-number")
     @Operation(summary = "根据合同编号获得交易信息")
-    @PreAuthorize("@ss.hasPermission('base:contract:get')")
+    @PreAuthorize("@ss.hasAnyPermissions({'base:contract:get','purchaseContract:detail'})")
     public CommonResult<TransactionInfoRespVO> transactionInfoByPaperNumber(
             @RequestParam("contractPaperNumber") String contractPaperNumber
     ) {