From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTenantController.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 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 ad65a32..c1d5f10 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,11 +68,14 @@
/**
* 添加租户管理
*/
- @PreAuthorize("@ss.hasPermi('system:tenant:add')")
+ @PreAuthorize("@ss.hasPermi('tenant:list:add')")
@Log(title = "租户信息-新增租户", businessType = BusinessType.INSERT)
@ApiOperation(value = "添加租户")
@PostMapping(value = "/add")
public R<Boolean> add(@Validated @RequestBody TTenantDTO dto) {
+ if(tenantService.isExit(dto)){
+ return R.fail("该账号已存在");
+ }
// 密码加密
dto.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
return R.ok(tenantService.save(dto));
@@ -81,11 +84,14 @@
/**
* 修改租户
*/
- @PreAuthorize("@ss.hasPermi('system:tenant:update')")
+ @PreAuthorize("@ss.hasPermi('tenant:list:edit')")
@Log(title = "租户信息-修改租户", businessType = BusinessType.UPDATE)
@ApiOperation(value = "修改租户")
@PostMapping(value = "/update")
public R<Boolean> update(@Validated @RequestBody TTenantDTO dto) {
+ if(tenantService.isExit(dto)){
+ return R.fail("该账号已存在");
+ }
// 密码加密
if(StringUtils.isNotBlank(dto.getPassword())){
dto.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
@@ -96,17 +102,16 @@
/**
* 查看租户详情
*/
- @PreAuthorize("@ss.hasPermi('system:tenant:detail')")
+ @PreAuthorize("@ss.hasPermi('tenant:list:detail')")
@ApiOperation(value = "查看租户详情")
@GetMapping(value = "/getDetailById")
public R<TTenant> getDetailById(@RequestParam String id) {
TTenant tenant = tenantService.getById(id);
- tenant.setTenantAttributes(StringUtils.isNotEmpty(tenant.getTenantAttributes())?DictUtils.getDictLabel(DictConstants.DICT_TYPE_TENANT_ATTRIBUTE,tenant.getTenantAttributes()):"");
- tenant.setTenantType(StringUtils.isNotEmpty(tenant.getTenantType())?DictUtils.getDictLabel(DictConstants.DICT_TYPE_TENANT_TYPE,tenant.getTenantType()):"");
+// tenant.setTenantAttributes(StringUtils.isNotEmpty(tenant.getTenantAttributes())?DictUtils.getDictLabel(DictConstants.DICT_TYPE_TENANT_ATTRIBUTE,tenant.getTenantAttributes()):"");
+// tenant.setTenantType(StringUtils.isNotEmpty(tenant.getTenantType())?DictUtils.getDictLabel(DictConstants.DICT_TYPE_TENANT_TYPE,tenant.getTenantType()):"");
return R.ok(tenant);
}
- @PreAuthorize("@ss.hasPermi('system:contract:list')")
@ApiOperation(value = "获取合同分页列表")
@GetMapping(value = "/contractListByTenantId")
public R<List<TContract>> contractListByTenantId(@RequestParam String tenantId) {
@@ -116,7 +121,7 @@
/**
* 删除租户
*/
- @PreAuthorize("@ss.hasPermi('system:tenant:delete')")
+ @PreAuthorize("@ss.hasPermi('tenant:list:edit')")
@Log(title = "租户信息-删除租户", businessType = BusinessType.DELETE)
@ApiOperation(value = "删除租户")
@DeleteMapping(value = "/deleteById")
@@ -127,7 +132,7 @@
/**
* 批量删除租户
*/
- @PreAuthorize("@ss.hasPermi('system:tenant:delete')")
+ @PreAuthorize("@ss.hasPermi('tenant:list:edit')")
@Log(title = "租户信息-删除租户", businessType = BusinessType.DELETE)
@ApiOperation(value = "批量删除租户")
@DeleteMapping(value = "/deleteByIds")
@@ -139,7 +144,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