From 28d40a97ffa0acfda8e3766b0edd08e24c8dd21f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 04 四月 2025 00:55:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTenantController.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTenantController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTenantController.java
index dd19d51..d9dd9c7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTenantController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTenantController.java
@@ -58,7 +58,7 @@
/**
* 获取租户管理列表
*/
- @PreAuthorize("@ss.hasPermi('system:tenant:list')")
+ @PreAuthorize("@ss.hasPermi('tenant:list')")
@ApiOperation(value = "获取租户分页列表")
@PostMapping(value = "/pageList")
public R<PageInfo<TenantVO>> pageList(@RequestBody TTenantQuery query) {
@@ -68,7 +68,7 @@
/**
* 添加租户管理
*/
- @PreAuthorize("@ss.hasPermi('system:tenant:add')")
+ @PreAuthorize("@ss.hasPermi('tenant:list:add')")
@Log(title = "租户信息-新增租户", businessType = BusinessType.INSERT)
@ApiOperation(value = "添加租户")
@PostMapping(value = "/add")
@@ -84,7 +84,7 @@
/**
* 修改租户
*/
- @PreAuthorize("@ss.hasPermi('system:tenant:update')")
+ @PreAuthorize("@ss.hasPermi('tenant:list:edit')")
@Log(title = "租户信息-修改租户", businessType = BusinessType.UPDATE)
@ApiOperation(value = "修改租户")
@PostMapping(value = "/update")
@@ -102,7 +102,7 @@
/**
* 查看租户详情
*/
- @PreAuthorize("@ss.hasPermi('system:tenant:detail')")
+ @PreAuthorize("@ss.hasPermi('tenant:list:detail')")
@ApiOperation(value = "查看租户详情")
@GetMapping(value = "/getDetailById")
public R<TTenant> getDetailById(@RequestParam String id) {
@@ -112,17 +112,19 @@
return R.ok(tenant);
}
- @PreAuthorize("@ss.hasPermi('system:contract:list')")
@ApiOperation(value = "获取合同分页列表")
@GetMapping(value = "/contractListByTenantId")
public R<List<TContract>> contractListByTenantId(@RequestParam String tenantId) {
- return R.ok(contractService.list(Wrappers.lambdaQuery(TContract.class).eq(TContract::getTenantId, tenantId)));
+ String businessDeptId = SecurityUtils.getBusinessDeptId();
+ return R.ok(contractService.list(Wrappers.lambdaQuery(TContract.class)
+ .eq(!businessDeptId.equals("0"), TContract::getBusinessDeptId, businessDeptId)
+ .eq(TContract::getTenantId, tenantId)));
}
/**
* 删除租户
*/
- @PreAuthorize("@ss.hasPermi('system:tenant:delete')")
+ @PreAuthorize("@ss.hasPermi('tenant:list:edit')")
@Log(title = "租户信息-删除租户", businessType = BusinessType.DELETE)
@ApiOperation(value = "删除租户")
@DeleteMapping(value = "/deleteById")
@@ -133,7 +135,7 @@
/**
* 批量删除租户
*/
- @PreAuthorize("@ss.hasPermi('system:tenant:delete')")
+ @PreAuthorize("@ss.hasPermi('tenant:list:edit')")
@Log(title = "租户信息-删除租户", businessType = BusinessType.DELETE)
@ApiOperation(value = "批量删除租户")
@DeleteMapping(value = "/deleteByIds")
@@ -145,7 +147,6 @@
* 导出
*/
@ApiOperation(value = "导出")
- @PreAuthorize("@ss.hasPermi('system:contract:export')")
@Log(title = "导出", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void exportOpticalInspection(@Validated @RequestBody TContractQuery query)
--
Gitblit v1.7.1