From 641f40f0712a96998b07202690ac5259b51e9d72 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Fri, 11 Jul 2025 18:18:35 +0800
Subject: [PATCH] 商户类型
---
oying-system/src/main/java/com/oying/modules/system/service/impl/DataServiceImpl.java | 27 ++++++++-------------------
1 files changed, 8 insertions(+), 19 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/system/service/impl/DataServiceImpl.java b/oying-system/src/main/java/com/oying/modules/system/service/impl/DataServiceImpl.java
index 7242f12..97caf87 100644
--- a/oying-system/src/main/java/com/oying/modules/system/service/impl/DataServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/system/service/impl/DataServiceImpl.java
@@ -1,12 +1,10 @@
package com.oying.modules.system.service.impl;
import cn.hutool.core.collection.CollUtil;
-import com.oying.modules.system.domain.Dept;
import com.oying.modules.system.domain.Role;
import com.oying.modules.system.domain.User;
import lombok.RequiredArgsConstructor;
import com.oying.modules.system.service.DataService;
-import com.oying.modules.system.service.DeptService;
import com.oying.modules.system.service.RoleService;
import com.oying.utils.CacheKey;
import com.oying.utils.RedisUtils;
@@ -26,7 +24,6 @@
private final RedisUtils redisUtils;
private final RoleService roleService;
- private final DeptService deptService;
/**
* 用户角色和用户机构改变时需清理缓存
@@ -34,11 +31,11 @@
* @return /
*/
@Override
- public List<Long> getDeptIds(User user) {
+ public List<Long> getDataIds(User user) {
String key = CacheKey.DATA_USER + user.getId();
List<Long> ids = redisUtils.getList(key, Long.class);
if (CollUtil.isEmpty(ids)) {
- Set<Long> deptIds = new HashSet<>();
+ Set<Long> dataIds = new HashSet<>();
// 查询用户角色
List<Role> roleList = roleService.findByUsersId(user.getId());
// 获取对应的机构ID
@@ -46,16 +43,15 @@
DataScopeEnum dataScopeEnum = DataScopeEnum.find(role.getDataScope());
switch (Objects.requireNonNull(dataScopeEnum)) {
case THIS_LEVEL:
- deptIds.add(user.getDept().getId());
break;
case CUSTOMIZE:
- deptIds.addAll(getCustomize(deptIds, role));
+ dataIds.addAll(getCustomize(dataIds, role));
break;
default:
return new ArrayList<>();
}
}
- ids = new ArrayList<>(deptIds);
+ ids = new ArrayList<>(dataIds);
redisUtils.set(key, ids, 1, TimeUnit.DAYS);
}
return ids;
@@ -63,19 +59,12 @@
/**
* 获取自定义的数据权限
- * @param deptIds 机构ID
+ * @param dataIds 机构ID
* @param role 角色
* @return 数据权限ID
*/
- public Set<Long> getCustomize(Set<Long> deptIds, Role role){
- Set<Dept> depts = deptService.findByRoleId(role.getId());
- for (Dept dept : depts) {
- deptIds.add(dept.getId());
- List<Dept> deptChildren = deptService.findByPid(dept.getId());
- if (CollUtil.isNotEmpty(deptChildren)) {
- deptIds.addAll(deptService.getDeptChildren(deptChildren));
- }
- }
- return deptIds;
+ public Set<Long> getCustomize(Set<Long> dataIds, Role role){
+ System.out.println(role);
+ return dataIds;
}
}
--
Gitblit v1.9.3