From 86cdd920b68274185233383f69ddb974052b6b6f Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 01 四月 2024 17:55:51 +0800
Subject: [PATCH] system模块修改
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/DataScopeManagerServiceImpl.java | 226 +++++++++++---------------------------------------------
1 files changed, 46 insertions(+), 180 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/DataScopeManagerServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/DataScopeManagerServiceImpl.java
index 97b26a2..b71d5c5 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/DataScopeManagerServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/DataScopeManagerServiceImpl.java
@@ -1,21 +1,23 @@
package com.qianwen.smartman.modules.system.service.impl;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import java.lang.invoke.SerializedLambda;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import com.qianwen.smartman.common.cache.RegionCache;
-import com.qianwen.smartman.common.cache.SysCache;
-import com.qianwen.smartman.common.utils.Lambda;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.qianwen.core.log.exception.ServiceException;
import com.qianwen.core.secure.utils.AuthUtil;
import com.qianwen.core.tool.constant.BladeConstant;
import com.qianwen.core.tool.node.ForestNodeMerger;
import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.cache.SysCache;
+import com.qianwen.smartman.common.utils.Lambda;
+import com.qianwen.smartman.modules.cps.entity.Employee;
import com.qianwen.smartman.modules.cps.service.IEmployeeService;
import com.qianwen.smartman.modules.system.entity.Dept;
import com.qianwen.smartman.modules.system.entity.DeptScope;
@@ -26,11 +28,8 @@
import com.qianwen.smartman.modules.system.vo.DataScopeGrantVO;
import com.qianwen.smartman.modules.system.vo.DeptVO;
import com.qianwen.smartman.modules.system.wrapper.DeptWrapper;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/system/service/impl/DataScopeManagerServiceImpl.class */
public class DataScopeManagerServiceImpl extends ServiceImpl<DeptMapper, Dept> implements IDataScopeManagerService {
private static final String TENANT_ID = "tenantId";
private static final String PARENT_ID = "parentId";
@@ -38,156 +37,6 @@
private final IUserDeptService userDeptService;
private final IEmployeeService employeeService;
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -1334165927:
- if (implMethodName.equals("getScopeId")) {
- z = true;
- break;
- }
- break;
- case -1270120474:
- if (implMethodName.equals("getDeptName")) {
- z = true;
- break;
- }
- break;
- case -1041904421:
- if (implMethodName.equals("getParentId")) {
- z = true;
- break;
- }
- break;
- case -133553590:
- if (implMethodName.equals("getAncestors")) {
- z = false;
- break;
- }
- break;
- case 98245393:
- if (implMethodName.equals("getId")) {
- z = true;
- break;
- }
- break;
- case 360688950:
- if (implMethodName.equals("getDeptId")) {
- z = true;
- break;
- }
- break;
- case 771206363:
- if (implMethodName.equals("getTenantId")) {
- z = true;
- break;
- }
- break;
- }
- switch (z) {
- case false:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/Dept") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getAncestors();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/DeptScope") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getScopeId();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/UserDept") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getDeptId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/Employee") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getDeptId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/DeptScope") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getDeptId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/DeptScope") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getDeptId();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/Dept") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/Dept") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getTenantId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/Dept") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getTenantId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/Dept") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getTenantId();
- };
- }
- break;
- case RegionCache.VILLAGE_LEVEL /* 5 */:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/Dept") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getDeptName();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/Dept") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getDeptName();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/Dept") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getDeptName();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/Dept") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getDeptName();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/Dept") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getParentId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/Dept") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getParentId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/Dept") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getParentId();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public DataScopeManagerServiceImpl(final IDeptScopeService deptScopeService, final IUserDeptService userDeptService, final IEmployeeService employeeService) {
this.deptScopeService = deptScopeService;
@@ -235,13 +84,15 @@
@Override // org.springblade.modules.system.service.IDataScopeManagerService
public String getDeptIds(String tenantId, String deptNames) {
+ List<Dept> deptList = this.baseMapper.selectList(Wrappers.<Dept>query().lambda().eq(Dept::getTenantId, tenantId).in(Dept::getDeptName, Func.toStrList(deptNames)));
+ /*
List<Dept> deptList = ((DeptMapper) this.baseMapper).selectList((Wrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().eq((v0) -> {
return v0.getTenantId();
}, tenantId)).in((v0) -> {
return v0.getDeptName();
- }, Func.toStrList(deptNames)));
+ }, Func.toStrList(deptNames)));*/
if (deptList != null && deptList.size() > 0) {
- return (String) deptList.stream().map(dept -> {
+ return deptList.stream().map(dept -> {
return Func.toStr(dept.getId());
}).distinct().collect(Collectors.joining(","));
}
@@ -250,15 +101,17 @@
@Override // org.springblade.modules.system.service.IDataScopeManagerService
public String getDeptIdsByFuzzy(String tenantId, String deptNames) {
+ LambdaQueryWrapper<Dept> wrapper = Wrappers.<Dept>query().lambda().eq(Dept::getTenantId, tenantId);
+ /*
Wrapper wrapper = (LambdaQueryWrapper) Wrappers.query().lambda().eq((v0) -> {
return v0.getTenantId();
- }, tenantId);
+ }, tenantId);*/
wrapper.and(wrapper2 -> {
List<String> names = Func.toStrList(deptNames);
names.forEach(name -> {
- LambdaQueryWrapper lambdaQueryWrapper = (LambdaQueryWrapper) ((LambdaQueryWrapper) wrapper2.like((v0) -> {
+ LambdaQueryWrapper lambdaQueryWrapper = wrapper2.like((v0) -> {
return v0.getDeptName();
- }, name)).or();
+ }, name).or();
});
});
List<Dept> deptList = ((DeptMapper) this.baseMapper).selectList(wrapper);
@@ -272,21 +125,25 @@
@Override // org.springblade.modules.system.service.IDataScopeManagerService
public List<String> getDeptNames(String deptIds) {
- return ((DeptMapper) this.baseMapper).getDeptNames(Func.toLongArray(deptIds));
+ return this.baseMapper.getDeptNames(Func.toLongArray(deptIds));
}
@Override // org.springblade.modules.system.service.IDataScopeManagerService
public List<Dept> getDeptChild(Long deptId) {
+ return this.baseMapper.selectList(Wrappers.<Dept>query().lambda().like(Dept::getAncestors, deptId));
+ /*
return ((DeptMapper) this.baseMapper).selectList((Wrapper) Wrappers.query().lambda().like((v0) -> {
return v0.getAncestors();
- }, deptId));
+ }, deptId));*/
}
@Override // org.springblade.modules.system.service.IDataScopeManagerService
public boolean removeDept(String ids) {
+ Long cnt = this.baseMapper.selectCount(Wrappers.<Dept>query().lambda().in(Dept::getParentId, Func.toLongList(ids)));
+ /*
Long cnt = ((DeptMapper) this.baseMapper).selectCount((Wrapper) Wrappers.query().lambda().in((v0) -> {
return v0.getParentId();
- }, Func.toLongList(ids)));
+ }, Func.toLongList(ids)));*/
if (cnt.longValue() > 0) {
throw new ServiceException("璇峰厛鍒犻櫎瀛愯妭鐐�!");
}
@@ -300,13 +157,15 @@
}, deptId)) != 0) {
throw new ServiceException("鏃犳硶鍒犻櫎,璐﹀彿缁戝畾浜嗚鏉冮檺");
}
- if (deptId.stream().anyMatch(dept -> {
- return this.employeeService.count(Lambda.create().findIn((v0) -> {
- return v0.getDeptId();
- }, String.valueOf(dept))) != 0;
- })) {
- throw new ServiceException("鏃犳硶鍒犻櫎, 鍛樺伐缁戝畾浜嗚鏉冮檺");
+
+ //long match = deptId.stream().anyMatch(dept -> this.employeeService.count(Lambda.<Employee>create().findIn(Employee::getDeptId, String.valueOf(dept)))) != 0L;
+ if (deptId.stream().anyMatch(dept -> (this.employeeService.count(Lambda.<Employee>create().findIn(Employee::getDeptId, String.valueOf(dept))) != 0L))) {
+ throw new ServiceException("鏃犳硶鍒犻櫎, 鍛樺伐缁戝畾浜嗚鏉冮檺");
}
+ /*
+ if (match) {
+ throw new ServiceException("鏃犳硶鍒犻櫎, 鍛樺伐缁戝畾浜嗚鏉冮檺");
+ }*/
}
@Override // org.springblade.modules.system.service.IDataScopeManagerService
@@ -332,7 +191,9 @@
@Override // org.springblade.modules.system.service.IDataScopeManagerService
public List<DeptVO> search(String deptName, Long parentId) {
- Wrapper lambda = Wrappers.query().lambda();
+ LambdaQueryWrapper<Dept> lambda = Wrappers.<Dept>query().lambda();
+ /*
+ Wrapper lambda = Wrappers.query().lambda();*/
if (Func.isNotEmpty(deptName)) {
lambda.like((v0) -> {
return v0.getDeptName();
@@ -343,11 +204,14 @@
return v0.getParentId();
}, parentId);
}
- List<Dept> deptList = ((DeptMapper) this.baseMapper).selectList(lambda);
+ List<Dept> deptList = this.baseMapper.selectList(lambda);
return DeptWrapper.build().listNodeVO(deptList);
}
private void checkExistDeptNameWithSameLevel(String tenantId, Long parentId, Long id, String name) {
+ List<Dept> list = list(Wrappers.<Dept>lambdaQuery().eq(Dept::getTenantId, tenantId).eq(Dept::getParentId, parentId)
+ .eq(Dept::getDeptName, name).ne(Func.isNotEmpty(id), Dept::getId, id));
+ /*
List<Dept> list = list(((LambdaQueryWrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getTenantId();
}, tenantId)).eq((v0) -> {
@@ -356,7 +220,7 @@
return v0.getDeptName();
}, name)).ne(Func.isNotEmpty(id), (v0) -> {
return v0.getId();
- }, id));
+ }, id));*/
if (Func.isNotEmpty(list)) {
throw new ServiceException("鍚屼竴鐖舵満鏋勪笅涓嶈兘瀛樺湪鍚屽悕鏈烘瀯鍚嶇О");
}
@@ -368,7 +232,7 @@
this.deptScopeService.remove(Lambda.eq((v0) -> {
return v0.getDeptId();
}, grantVO.getDeptId()));
- List<DeptScope> deptScopeList = (List) grantVO.getDataScopeIds().stream().map(scopeId -> {
+ List<DeptScope> deptScopeList = grantVO.getDataScopeIds().stream().map(scopeId -> {
DeptScope scope = new DeptScope();
scope.setScopeId(scopeId);
scope.setDeptId(grantVO.getDeptId());
@@ -381,10 +245,12 @@
@Override // org.springblade.modules.system.service.IDataScopeManagerService
public List<String> grantSelect(final String deptId) {
+ return this.deptScopeService.listObjs(Lambda.eq(DeptScope::getDeptId, deptId).select(DeptScope::getScopeId), String::valueOf);
+ /*
return this.deptScopeService.listObjs(Lambda.eq((v0) -> {
return v0.getDeptId();
}, deptId).select((v0) -> {
return v0.getScopeId();
- }), String::valueOf);
+ }), String::valueOf);*/
}
}
--
Gitblit v1.9.3