From 56160395f36a0c443b160f6047e346a4290da872 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 21 一月 2025 16:54:25 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/xiaochen991015/xizang
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTenantController.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 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 31b8618..10fe7a4 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
@@ -5,6 +5,8 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.dto.TTenantDTO;
import com.ruoyi.system.model.TTenant;
import com.ruoyi.system.query.TTenantQuery;
@@ -39,11 +41,11 @@
/**
* 获取租户管理列表
*/
-// @ApiOperation(value = "获取租户分页列表")
-// @PostMapping(value = "/pageList")
-// public AjaxResult<PageInfo<TTenant>> pageList(@RequestBody TTenantQuery query) {
-// return AjaxResult.success(tenantService.pageList(query));
-// }
+ @ApiOperation(value = "获取租户分页列表")
+ @PostMapping(value = "/pageList")
+ public AjaxResult<PageInfo<TTenant>> pageList(@RequestBody TTenantQuery query) {
+ return AjaxResult.success(tenantService.pageList(query));
+ }
/**
* 添加租户管理
@@ -52,6 +54,8 @@
@ApiOperation(value = "添加租户")
@PostMapping(value = "/add")
public AjaxResult<Boolean> add(@Validated @RequestBody TTenantDTO dto) {
+ // 密码加密
+ dto.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
return AjaxResult.success(tenantService.save(dto));
}
@@ -62,6 +66,10 @@
@ApiOperation(value = "修改租户")
@PostMapping(value = "/update")
public AjaxResult<Boolean> update(@Validated @RequestBody TTenantDTO dto) {
+ // 密码加密
+ if(StringUtils.isNotBlank(dto.getPassword())){
+ dto.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
+ }
return AjaxResult.success(tenantService.updateById(dto));
}
--
Gitblit v1.7.1