From ef7506eb3af65ad2c054ed4e44b24fc297790a61 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 28 二月 2025 11:51:46 +0800
Subject: [PATCH] 权限
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTenantController.java | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 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 a9fdcb3..0bd938e 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
@@ -9,10 +9,7 @@
import com.ruoyi.common.constant.DictConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.DictUtils;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.WebUtils;
+import com.ruoyi.common.utils.*;
import com.ruoyi.system.dto.TTenantDTO;
import com.ruoyi.system.export.ContractExport;
import com.ruoyi.system.model.TContract;
@@ -61,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) {
@@ -71,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 +81,7 @@
/**
* 修改租户
*/
- @PreAuthorize("@ss.hasPermi('system:tenant:update')")
+ @PreAuthorize("@ss.hasPermi('tenant:list:edit')")
@Log(title = "租户信息-修改租户", businessType = BusinessType.UPDATE)
@ApiOperation(value = "修改租户")
@PostMapping(value = "/update")
@@ -99,7 +96,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) {
@@ -109,7 +106,6 @@
return R.ok(tenant);
}
- @PreAuthorize("@ss.hasPermi('system:contract:list')")
@ApiOperation(value = "获取合同分页列表")
@GetMapping(value = "/contractListByTenantId")
public R<List<TContract>> contractListByTenantId(@RequestParam String tenantId) {
@@ -119,7 +115,7 @@
/**
* 删除租户
*/
- @PreAuthorize("@ss.hasPermi('system:tenant:delete')")
+ @PreAuthorize("@ss.hasPermi('tenant:list:edit')")
@Log(title = "租户信息-删除租户", businessType = BusinessType.DELETE)
@ApiOperation(value = "删除租户")
@DeleteMapping(value = "/deleteById")
@@ -130,7 +126,7 @@
/**
* 批量删除租户
*/
- @PreAuthorize("@ss.hasPermi('system:tenant:delete')")
+ @PreAuthorize("@ss.hasPermi('tenant:list:edit')")
@Log(title = "租户信息-删除租户", businessType = BusinessType.DELETE)
@ApiOperation(value = "批量删除租户")
@DeleteMapping(value = "/deleteByIds")
@@ -142,7 +138,6 @@
* 导出
*/
@ApiOperation(value = "导出")
- @PreAuthorize("@ss.hasPermi('system:contract:export')")
@Log(title = "导出", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void exportOpticalInspection(@Validated @RequestBody TContractQuery query)
@@ -155,12 +150,13 @@
contractExport.setContractName(contract.getContractName());
contractExport.setPartyOneName(contract.getPartyOneName());
contractExport.setPartyTwoName(contract.getPartyTwoName());
- contractExport.setCreate_time(contract.getCreateTime());
- contractExport.setStartTime(contract.getStartTime());
- contractExport.setEndTime(contract.getEndTime());
+ contractExport.setCreateTime(DateUtils.localDateTimeToStringYear(contract.getCreateTime()));
+ contractExport.setStartTime(DateUtils.localDateTimeToStringYear(contract.getStartTime()));
+ contractExport.setEndTime(DateUtils.localDateTimeToStringYear(contract.getEndTime()));
contractExport.setPayType(DictUtils.getDictLabel(DictConstants.DICT_TYPE_CONTRACT_PAY_TYPE,contract.getPayType()));
contractExport.setDeposit(contract.getDeposit()+"");
contractExport.setStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_CONTRACT_STATUS,contract.getStatus()));
+ contractExports.add(contractExport);
}
Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), ContractExport.class, contractExports);
HttpServletResponse response = WebUtils.response();
--
Gitblit v1.7.1