From 7d856b030b0c784adb4d9c59d22543e6c5d56dc0 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 05 十一月 2024 16:52:10 +0800
Subject: [PATCH] update 优化 不传用户id不校验数据权限
---
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java | 36 ++++++++++++++++++++----------------
1 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java
index 2f86062..7476549 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java
@@ -1,6 +1,7 @@
package org.dromara.system.service.impl;
import cn.dev33.satoken.secure.BCrypt;
+import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.ObjectUtil;
@@ -203,7 +204,7 @@
String numbers = RandomUtil.randomNumbers(6);
// 鍒ゆ柇鏄惁瀛樺湪锛屽鏋滃瓨鍦ㄥ垯閲嶆柊鐢熸垚
if (tenantIds.contains(numbers)) {
- generateTenantId(tenantIds);
+ return generateTenantId(tenantIds);
}
return numbers;
}
@@ -413,33 +414,36 @@
Map<String, SysDictData> map = StreamUtils.toIdentityMap(dataListTenant, SysDictData::getDictValue);
for (SysDictData dictData : dataList) {
if (!map.containsKey(dictData.getDictValue())) {
+ SysDictData data = BeanUtil.toBean(dictData, SysDictData.class);
// 璁剧疆瀛楀吀缂栫爜涓� null
- dictData.setDictCode(null);
- dictData.setTenantId(tenantId);
- dictData.setCreateTime(null);
- dictData.setUpdateTime(null);
+ data.setDictCode(null);
+ data.setTenantId(tenantId);
+ data.setCreateTime(null);
+ data.setUpdateTime(null);
set.add(tenantId);
- saveDataList.add(dictData);
+ saveDataList.add(data);
}
}
} else {
- dictType.setDictId(null);
- dictType.setTenantId(tenantId);
- dictType.setCreateTime(null);
- dictType.setUpdateTime(null);
+ SysDictType type = BeanUtil.toBean(dictType, SysDictType.class);
+ type.setDictId(null);
+ type.setTenantId(tenantId);
+ type.setCreateTime(null);
+ type.setUpdateTime(null);
set.add(tenantId);
- saveTypeList.add(dictType);
+ saveTypeList.add(type);
if (CollUtil.isNotEmpty(dataList)) {
// 绛涢�夊嚭 dictType 瀵瑰簲鐨� data
for (SysDictData dictData : dataList) {
+ SysDictData data = BeanUtil.toBean(dictData, SysDictData.class);
// 璁剧疆瀛楀吀缂栫爜涓� null
- dictData.setDictCode(null);
- dictData.setTenantId(tenantId);
- dictData.setCreateTime(null);
- dictData.setUpdateTime(null);
+ data.setDictCode(null);
+ data.setTenantId(tenantId);
+ data.setCreateTime(null);
+ data.setUpdateTime(null);
set.add(tenantId);
+ saveDataList.add(data);
}
- saveDataList.addAll(dataList);
}
}
}
--
Gitblit v1.9.3