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/UserServiceImpl.java | 545 +++++++++++++----------------------------------------
1 files changed, 138 insertions(+), 407 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/UserServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/UserServiceImpl.java
index 115703e..016348f 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/UserServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/UserServiceImpl.java
@@ -1,14 +1,5 @@
package com.qianwen.smartman.modules.system.service.impl;
-import cn.hutool.core.convert.Convert;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
-import java.lang.invoke.SerializedLambda;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -19,18 +10,15 @@
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import com.qianwen.smartman.common.cache.CacheNames;
-import com.qianwen.smartman.common.cache.DictCache;
-import com.qianwen.smartman.common.cache.ParamCache;
-import com.qianwen.smartman.common.cache.RegionCache;
-import com.qianwen.smartman.common.cache.SysCache;
-import com.qianwen.smartman.common.cache.UserCache;
-import com.qianwen.smartman.common.constant.CommonConstant;
-import com.qianwen.smartman.common.constant.DncConstant;
-import com.qianwen.smartman.common.constant.TenantConstant;
-import com.qianwen.smartman.common.constant.UserConstant;
-import com.qianwen.smartman.common.enums.DictEnum;
-import com.qianwen.smartman.common.utils.Lambda;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.qianwen.core.log.exception.ServiceException;
import com.qianwen.core.mp.base.BaseServiceImpl;
import com.qianwen.core.mp.support.Condition;
@@ -48,6 +36,17 @@
import com.qianwen.core.tool.utils.Func;
import com.qianwen.core.tool.utils.ObjectUtil;
import com.qianwen.core.tool.utils.StringUtil;
+import com.qianwen.smartman.common.cache.CacheNames;
+import com.qianwen.smartman.common.cache.DictCache;
+import com.qianwen.smartman.common.cache.ParamCache;
+import com.qianwen.smartman.common.cache.SysCache;
+import com.qianwen.smartman.common.cache.UserCache;
+import com.qianwen.smartman.common.constant.CommonConstant;
+import com.qianwen.smartman.common.constant.DncConstant;
+import com.qianwen.smartman.common.constant.TenantConstant;
+import com.qianwen.smartman.common.constant.UserConstant;
+import com.qianwen.smartman.common.enums.DictEnum;
+import com.qianwen.smartman.common.utils.Lambda;
import com.qianwen.smartman.modules.auth.enums.UserEnum;
import com.qianwen.smartman.modules.cps.entity.Employee;
import com.qianwen.smartman.modules.cps.service.IEmployeeService;
@@ -79,8 +78,8 @@
import com.qianwen.smartman.modules.system.vo.UserAccountVO;
import com.qianwen.smartman.modules.system.vo.UserVO;
import com.qianwen.smartman.modules.system.wrapper.UserWrapper;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+
+import cn.hutool.core.convert.Convert;
@Service
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/system/service/impl/UserServiceImpl.class */
@@ -94,341 +93,6 @@
private final IEmployeeService employeeService;
private final IWorkbenchService workbenchService;
private final IOuterAppConfigService outerAppConfigService;
-
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -1000081391:
- if (implMethodName.equals("getPassword")) {
- z = true;
- break;
- }
- break;
- case -140458505:
- if (implMethodName.equals("getAccount")) {
- z = true;
- break;
- }
- break;
- case -75080655:
- if (implMethodName.equals("getUuid")) {
- z = true;
- break;
- }
- break;
- case 98245393:
- if (implMethodName.equals("getId")) {
- z = true;
- break;
- }
- break;
- case 360688950:
- if (implMethodName.equals("getDeptId")) {
- z = true;
- break;
- }
- break;
- case 713563345:
- if (implMethodName.equals("getPostId")) {
- z = true;
- break;
- }
- break;
- case 770598695:
- if (implMethodName.equals("getRoleId")) {
- z = true;
- break;
- }
- break;
- case 771206363:
- if (implMethodName.equals("getTenantId")) {
- z = true;
- break;
- }
- break;
- case 799509265:
- if (implMethodName.equals("getSource")) {
- z = true;
- break;
- }
- break;
- case 803533544:
- if (implMethodName.equals("getStatus")) {
- z = true;
- break;
- }
- break;
- case 859984188:
- if (implMethodName.equals("getUserId")) {
- z = true;
- break;
- }
- break;
- case 952316798:
- if (implMethodName.equals("getPwdUpdateDate")) {
- z = true;
- break;
- }
- break;
- case 961079513:
- if (implMethodName.equals("getIsDeleted")) {
- z = true;
- break;
- }
- break;
- case 1952444902:
- if (implMethodName.equals("getEmail")) {
- z = true;
- break;
- }
- break;
- case 1962468280:
- if (implMethodName.equals("getPhone")) {
- z = false;
- 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/User") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getPhone();
- };
- }
- 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/User") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- 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/User") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getRoleId();
- };
- }
- 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/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- 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/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- 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/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- 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/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- 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/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- 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/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- 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/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- 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/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- 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/core/mp/base/BaseEntity") && 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/core/tenant/mp/TenantEntity") && 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/core/tenant/mp/TenantEntity") && 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/core/tenant/mp/TenantEntity") && 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/core/tenant/mp/TenantEntity") && 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/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getStatus();
- };
- }
- 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/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getIsDeleted();
- };
- }
- 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/User") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getPassword();
- };
- }
- 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/UserOauth") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getSource();
- };
- }
- 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/UserOauth") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getSource();
- };
- }
- 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/User") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getAccount();
- };
- }
- 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/User") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getAccount();
- };
- }
- 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/User") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getAccount();
- };
- }
- 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/User") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getAccount();
- };
- }
- 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/UserOauth") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getUuid();
- };
- }
- 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/User") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getPostId();
- };
- }
- 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/User") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getEmail();
- };
- }
- 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/User") && lambda.getImplMethodSignature().equals("()Ljava/util/Date;")) {
- return (v0) -> {
- return v0.getPwdUpdateDate();
- };
- }
- 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.getUserId();
- };
- }
- 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/UserWeb") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getUserId();
- };
- }
- 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/UserApp") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getUserId();
- };
- }
- 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/UserOther") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getUserId();
- };
- }
- 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.getUserId();
- };
- }
- 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/UserWeb") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getUserId();
- };
- }
- 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/UserApp") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getUserId();
- };
- }
- 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/UserOther") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getUserId();
- };
- }
- 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/UserWeb") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getUserId();
- };
- }
- 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/UserApp") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getUserId();
- };
- }
- 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/UserOther") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getUserId();
- };
- }
- 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/UserOauth") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getUserId();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public UserServiceImpl(final IUserDeptService userDeptService, final IUserOauthService userOauthService, final IRoleService roleService, final BladeTenantProperties tenantProperties, final BladeRedis bladeRedis, final IEmployeeService employeeService, final IWorkbenchService workbenchService, final IOuterAppConfigService outerAppConfigService) {
this.userDeptService = userDeptService;
@@ -456,9 +120,12 @@
String decrypt = DesUtil.decryptFormHex(licenseKey, TenantConstant.DES_KEY);
accountNumber = ((Tenant) JsonUtil.parse(decrypt, Tenant.class)).getAccountNumber();
}
+
+ Long tenantCount = this.baseMapper.selectCount(Wrappers.<User>query().lambda().eq(User::getTenantId, tenantId));
+ /*
Long tenantCount = ((UserMapper) this.baseMapper).selectCount((Wrapper) Wrappers.query().lambda().eq((v0) -> {
return v0.getTenantId();
- }, tenantId));
+ }, tenantId));*/
if (accountNumber != null && accountNumber.intValue() > 0 && accountNumber.intValue() <= tenantCount.longValue()) {
throw new ServiceException("褰撳墠绉熸埛宸插埌鏈�澶ц处鍙烽搴�!");
}
@@ -475,11 +142,13 @@
}
isAdd = true;
}
+ Long userCount = this.baseMapper.selectCount(Wrappers.<User>query().lambda().eq(User::getTenantId, tenantId).eq(User::getAccount, user.getAccount()));
+ /*
Long userCount = ((UserMapper) this.baseMapper).selectCount((Wrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().eq((v0) -> {
return v0.getTenantId();
}, tenantId)).eq((v0) -> {
return v0.getAccount();
- }, user.getAccount()));
+ }, user.getAccount()));*/
if (userCount.longValue() > 0 && Func.isEmpty(user.getId())) {
throw new ServiceException(StringUtil.format("褰撳墠鐢ㄦ埛 [{}] 宸插瓨鍦�!", new Object[]{user.getAccount()}));
}
@@ -501,13 +170,19 @@
@Transactional(rollbackFor = {Exception.class})
public boolean updateUser(User user) {
String tenantId = user.getTenantId();
+ Long userCount = this.baseMapper.selectCount(
+ Wrappers.<User>query().lambda()
+ .eq(User::getTenantId, tenantId)
+ .eq(User::getAccount, user.getAccount())
+ .notIn(User::getId, new Object[] { user.getId() }));
+ /*
Long userCount = ((UserMapper) this.baseMapper).selectCount((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().eq((v0) -> {
return v0.getTenantId();
}, tenantId)).eq((v0) -> {
return v0.getAccount();
}, user.getAccount())).notIn((v0) -> {
return v0.getId();
- }, new Object[]{user.getId()}));
+ }, new Object[]{user.getId()}));*/
if (userCount.longValue() > 0) {
throw new ServiceException(StringUtil.format("褰撳墠鐢ㄦ埛 [{}] 宸插瓨鍦�!", new Object[]{user.getAccount()}));
}
@@ -529,9 +204,11 @@
userDept.setDeptId(deptId);
userDeptList.add(userDept);
});
+ this.userDeptService.remove(Wrappers.<UserDept>update().lambda().eq(UserDept::getUserId, user.getId()));
+ /*
this.userDeptService.remove((Wrapper) Wrappers.update().lambda().eq((v0) -> {
return v0.getUserId();
- }, user.getId()));
+ }, user.getId()));*/
return this.userDeptService.saveBatch(userDeptList);
}
@@ -543,7 +220,7 @@
@Override // org.springblade.modules.system.service.IUserService
public IPage<UserVO> selectUserSearch(UserVO user, Query query) {
- LambdaQueryWrapper<User> queryWrapper = Wrappers.query().lambda();
+ LambdaQueryWrapper<User> queryWrapper = Wrappers.<User>query().lambda();
if (StringUtil.isNotBlank(user.getAccount())) {
queryWrapper.likeRight((v0) -> {
return v0.getAccount();
@@ -555,9 +232,9 @@
queryWrapper.and(wrapper -> {
List<String> ids = Func.toStrList(deptIds);
ids.forEach(id -> {
- LambdaQueryWrapper lambdaQueryWrapper = (LambdaQueryWrapper) ((LambdaQueryWrapper) wrapper.like((v0) -> {
+ LambdaQueryWrapper lambdaQueryWrapper = wrapper.like((v0) -> {
return v0.getDeptId();
- }, id)).or();
+ }, id).or();
});
});
}
@@ -568,9 +245,9 @@
queryWrapper.and(wrapper2 -> {
List<String> ids = Func.toStrList(postIds);
ids.forEach(id -> {
- LambdaQueryWrapper lambdaQueryWrapper = (LambdaQueryWrapper) ((LambdaQueryWrapper) wrapper2.like((v0) -> {
+ LambdaQueryWrapper lambdaQueryWrapper = wrapper2.like((v0) -> {
return v0.getPostId();
- }, id)).or();
+ }, id).or();
});
});
}
@@ -581,13 +258,16 @@
@Override // org.springblade.modules.system.service.IUserService
public User userByAccount(String tenantId, String account) {
+ return this.baseMapper.selectOne(Wrappers.<User>query().lambda().eq(User::getTenantId, tenantId)
+ .eq(User::getAccount, account).eq(User::getIsDeleted, 0));
+ /*
return (User) ((UserMapper) this.baseMapper).selectOne((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().eq((v0) -> {
return v0.getTenantId();
}, tenantId)).eq((v0) -> {
return v0.getAccount();
}, account)).eq((v0) -> {
return v0.getIsDeleted();
- }, 0));
+ }, 0));*/
}
@Override // org.springblade.modules.system.service.IUserService
@@ -626,27 +306,33 @@
Kv detail = Kv.create().set("type", userEnum.getName());
if (userEnum == UserEnum.WEB) {
UserWeb userWeb = new UserWeb();
+ UserWeb query = userWeb.selectOne(Wrappers.<UserWeb>lambdaQuery().eq(UserWeb::getUserId, user.getId()));
+ /*
UserWeb query = (UserWeb) userWeb.selectOne((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getUserId();
- }, user.getId()));
+ }, user.getId()));*/
if (ObjectUtil.isNotEmpty(query)) {
detail.set("ext", query.getUserExt());
}
} else if (userEnum == UserEnum.APP) {
UserApp userApp = new UserApp();
+ UserApp query = userApp.selectOne(Wrappers.<UserApp>lambdaQuery().eq(UserApp::getUserId, user.getId()));
+ /*
UserApp query2 = (UserApp) userApp.selectOne((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getUserId();
- }, user.getId()));
- if (ObjectUtil.isNotEmpty(query2)) {
- detail.set("ext", query2.getUserExt());
+ }, user.getId()));*/
+ if (ObjectUtil.isNotEmpty(query)) {
+ detail.set("ext", query.getUserExt());
}
} else {
UserOther userOther = new UserOther();
+ UserOther query = (UserOther)userOther.selectOne(Wrappers.<UserOther>lambdaQuery().eq(UserOther::getUserId, user.getId()));
+ /*
UserOther query3 = (UserOther) userOther.selectOne((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getUserId();
- }, user.getId()));
- if (ObjectUtil.isNotEmpty(query3)) {
- detail.set("ext", query3.getUserExt());
+ }, user.getId()));*/
+ if (ObjectUtil.isNotEmpty(query)) {
+ detail.set("ext", query.getUserExt());
}
}
userInfo.setDetail(detail);
@@ -657,11 +343,15 @@
@Transactional(rollbackFor = {Exception.class})
public UserInfo userInfo(UserOauth userOauth) {
UserInfo userInfo;
+ UserOauth uo = this.userOauthService.getOne(Wrappers.<UserOauth>query().lambda()
+ .eq(UserOauth::getUuid, userOauth.getUuid())
+ .eq(UserOauth::getSource, userOauth.getSource()));
+ /*
UserOauth uo = (UserOauth) this.userOauthService.getOne((Wrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().eq((v0) -> {
return v0.getUuid();
}, userOauth.getUuid())).eq((v0) -> {
return v0.getSource();
- }, userOauth.getSource()));
+ }, userOauth.getSource()));*/
if (Func.isNotEmpty(uo) && Func.isNotEmpty(uo.getUserId())) {
userOauth.setId(uo.getId());
this.userOauthService.updateById(userOauth);
@@ -690,9 +380,11 @@
public boolean grant(String userIds, String roleIds) {
User user = new User();
user.setRoleId(roleIds);
+ return update(user, Wrappers.<User>update().lambda().in(User::getId, Func.toLongList(userIds)));
+ /*
return update(user, (Wrapper) Wrappers.update().lambda().in((v0) -> {
return v0.getId();
- }, Func.toLongList(userIds)));
+ }, Func.toLongList(userIds)));*/
}
@Override // org.springblade.modules.system.service.IUserService
@@ -701,9 +393,11 @@
user.setPassword(DigestUtil.encrypt(ParamCache.getValue(CommonConstant.DEFAULT_PARAM_PASSWORD)));
user.setUpdateTime(DateUtil.now());
user.setPwdUpdateDate(null);
+ return update(user, Wrappers.<User>update().lambda().in(User::getId, Func.toLongList(userIds)));
+ /*
return update(user, (Wrapper) Wrappers.update().lambda().in((v0) -> {
return v0.getId();
- }, Func.toLongList(userIds)));
+ }, Func.toLongList(userIds)));*/
}
@Override // org.springblade.modules.system.service.IUserService
@@ -723,13 +417,19 @@
if (!meetSecurityLevel(securityLevel.intValue(), newPassword)) {
throw new ServiceException("瀵嗙爜寮哄害鏍￠獙涓嶉�氳繃锛屽瘑鐮佸己搴︾瓑绾э細" + securityLevel);
}
+ return update(
+ Wrappers.<User>update().lambda()
+ .set(User::getPassword, DigestUtil.encrypt(newPassword))
+ .set(User::getPwdUpdateDate, DateUtil.now())
+ .eq(User::getId, userId));
+ /*
return update((Wrapper) ((LambdaUpdateWrapper) ((LambdaUpdateWrapper) Wrappers.update().lambda().set((v0) -> {
return v0.getPassword();
}, DigestUtil.encrypt(newPassword))).set((v0) -> {
return v0.getPwdUpdateDate();
}, DateUtil.now())).eq((v0) -> {
return v0.getId();
- }, userId));
+ }, userId));*/
}
private boolean meetSecurityLevel(int level, String password) {
@@ -764,9 +464,11 @@
throw new ServiceException("涓嶈兘鍒犻櫎鏈处鍙�!");
}
this.employeeService.updateUserIdIsNull(Func.toStrList(userIds));
+ this.userDeptService.remove(Lambda.in(UserDept::getUserId, (Object[])ids));
+ /*
this.userDeptService.remove(Lambda.in((v0) -> {
return v0.getUserId();
- }, ids));
+ }, ids));*/
return deleteLogic(Func.toLongList(userIds));
}
@@ -836,9 +538,12 @@
public boolean updatePlatform(Long userId, Integer userType, String userExt) {
if (userType.equals(Integer.valueOf(UserEnum.WEB.getCategory()))) {
UserWeb userWeb = new UserWeb();
+
+ UserWeb query = userWeb.selectOne(Wrappers.<UserWeb>lambdaQuery().eq(UserWeb::getUserId, userId));
+ /*
UserWeb query = (UserWeb) userWeb.selectOne((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getUserId();
- }, userId));
+ }, userId));*/
if (ObjectUtil.isNotEmpty(query)) {
userWeb.setId(query.getId());
}
@@ -847,22 +552,26 @@
return userWeb.insertOrUpdate();
} else if (userType.equals(Integer.valueOf(UserEnum.APP.getCategory()))) {
UserApp userApp = new UserApp();
+ UserApp userApp1 = userApp.selectOne(Wrappers.<UserApp>lambdaQuery().eq(UserApp::getUserId, userId));
+ /*
UserApp query2 = (UserApp) userApp.selectOne((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getUserId();
- }, userId));
- if (ObjectUtil.isNotEmpty(query2)) {
- userApp.setId(query2.getId());
+ }, userId));*/
+ if (ObjectUtil.isNotEmpty(userApp1)) {
+ userApp.setId(userApp1.getId());
}
userApp.setUserId(userId);
userApp.setUserExt(userExt);
return userApp.insertOrUpdate();
} else {
UserOther userOther = new UserOther();
+ UserOther query = userOther.selectOne(Wrappers.<UserOther>lambdaQuery().eq(UserOther::getUserId, userId));
+ /*
UserOther query3 = (UserOther) userOther.selectOne((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getUserId();
- }, userId));
- if (ObjectUtil.isNotEmpty(query3)) {
- userOther.setId(query3.getId());
+ }, userId));*/
+ if (ObjectUtil.isNotEmpty(query)) {
+ userOther.setId(query.getId());
}
userOther.setUserId(userId);
userOther.setUserExt(userExt);
@@ -876,27 +585,33 @@
UserVO userVO = UserWrapper.build().entityVO(detail);
if (userVO.getUserType().equals(Integer.valueOf(UserEnum.WEB.getCategory()))) {
UserWeb userWeb = new UserWeb();
+ UserWeb query = userWeb.selectOne(Wrappers.<UserWeb>lambdaQuery().eq(UserWeb::getUserId, user.getId()));
+ /*
UserWeb query = (UserWeb) userWeb.selectOne((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getUserId();
- }, user.getId()));
+ }, user.getId()));*/
if (ObjectUtil.isNotEmpty(query)) {
userVO.setUserExt(query.getUserExt());
}
} else if (userVO.getUserType().equals(Integer.valueOf(UserEnum.APP.getCategory()))) {
UserApp userApp = new UserApp();
+ UserApp query = userApp.selectOne(Wrappers.<UserApp>lambdaQuery().eq(UserApp::getUserId, user.getId()));
+ /*
UserApp query2 = (UserApp) userApp.selectOne((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getUserId();
- }, user.getId()));
- if (ObjectUtil.isNotEmpty(query2)) {
- userVO.setUserExt(query2.getUserExt());
+ }, user.getId()));*/
+ if (ObjectUtil.isNotEmpty(query)) {
+ userVO.setUserExt(query.getUserExt());
}
} else {
UserOther userOther = new UserOther();
+ UserOther query = userOther.selectOne(Wrappers.<UserOther>lambdaQuery().eq(UserOther::getUserId, user.getId()));
+ /*
UserOther query3 = (UserOther) userOther.selectOne((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getUserId();
- }, user.getId()));
- if (ObjectUtil.isNotEmpty(query3)) {
- userVO.setUserExt(query3.getUserExt());
+ }, user.getId()));*/
+ if (ObjectUtil.isNotEmpty(query)) {
+ userVO.setUserExt(query.getUserExt());
}
}
return userVO;
@@ -905,11 +620,13 @@
@Override // org.springblade.modules.system.service.IUserService
public boolean enable(Long id, boolean enable) {
Integer value = Integer.valueOf(enable ? 1 : 0);
+ return update(Wrappers.<User>update().lambda().set(User::getStatus, value).eq(User::getId, id));
+ /*
return update((Wrapper) ((LambdaUpdateWrapper) Wrappers.update().lambda().set((v0) -> {
return v0.getStatus();
}, value)).eq((v0) -> {
return v0.getId();
- }, id));
+ }, id));*/
}
@Override // org.springblade.modules.system.service.IUserService
@@ -924,21 +641,25 @@
@Override // org.springblade.modules.system.service.IUserService
public List<User> selectRoleUserList(String roleId) {
+ List<User> users = this.baseMapper.selectList(Lambda.<User>create().findIn(User::getRoleId, roleId, "/"));
+ /*
List<User> users = ((UserMapper) this.baseMapper).selectList(Lambda.create().findIn((v0) -> {
return v0.getRoleId();
- }, roleId, "/"));
+ }, roleId, "/"));*/
return users;
}
@Override // org.springblade.modules.system.service.IUserService
public Boolean roleBindUsers(String roleId, List<Long> userIds) {
StringBuilder stringBuilder = new StringBuilder(roleId);
+ List<User> userList = list(new QueryWrapper<User>().lambda().in(User::getId, userIds));
+ /*
List<User> userList = list((Wrapper) new QueryWrapper().lambda().in((v0) -> {
return v0.getId();
- }, userIds));
+ }, userIds));*/
if (Func.isNotEmpty(userList)) {
userList.forEach(user -> {
- String newRoleId = (String) Optional.ofNullable(user.getRoleId()).map(id -> {
+ String newRoleId = Optional.ofNullable(user.getRoleId()).map(id -> {
return !id.contains(roleId) ? stringBuilder.append(",").append(id).toString() : id;
}).orElse(roleId);
user.setRoleId(newRoleId);
@@ -950,12 +671,14 @@
@Override // org.springblade.modules.system.service.IUserService
public Boolean roleRemoveUsers(String roleId, List<Long> ids) {
+ List<User> userList = list(new QueryWrapper<User>().lambda().in(User::getId, ids));
+ /*
List<User> userList = list((Wrapper) new QueryWrapper().lambda().in((v0) -> {
return v0.getId();
- }, ids));
+ }, ids));*/
if (Func.isNotEmpty(userList)) {
userList.forEach(user -> {
- String newRoleId = (String) Stream.of((Object[]) user.getRoleId().split(",")).filter(str -> {
+ String newRoleId = Stream.of(user.getRoleId().split(",")).filter(str -> {
return !str.equals(roleId);
}).collect(Collectors.joining(","));
user.setRoleId(Func.isEmpty(newRoleId) ? null : newRoleId);
@@ -996,11 +719,14 @@
if (employee != null) {
result.setEmployeeId(employee.getId());
result.setEmployeeName(employee.getName());
+ List<UserOauth> userOauths = this.userOauthService.list(Wrappers.<UserOauth>lambdaQuery().eq(UserOauth::getUserId, employee.getId())
+ .in(UserOauth::getSource, Arrays.asList(new String[] { "DINGTALK_WEB", "WECHAT_ENTERPRISE_WEB" })));
+ /*
List<UserOauth> userOauths = this.userOauthService.list((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getUserId();
}, employee.getId())).in((v0) -> {
return v0.getSource();
- }, Arrays.asList(DingConstant.DING_AUTH_KEY, QyWechatConstant.QY_SOURCE)));
+ }, Arrays.asList(DingConstant.DING_AUTH_KEY, QyWechatConstant.QY_SOURCE)));*/
if (Func.isNotEmpty(userOauths)) {
userOauths.forEach(o -> {
if (o.getSource().equals(DingConstant.DING_AUTH_KEY)) {
@@ -1024,6 +750,11 @@
@Override // org.springblade.modules.system.service.IUserService
public List<NotifyUserDTO> getNotifySubscriberList(List<String> userIds) {
+ return list(Wrappers.<User>lambdaQuery().in(User::getId, userIds)
+ .select(User::getId, User::getPhone, User::getEmail )).stream()
+ .map(user -> new NotifyUserDTO(user.getId(), user.getEmail(), user.getPhone(), this.userOauthService.getUserMiniUuid(user.getId())))
+ .collect(Collectors.toList());
+ /*
return (List) list(((LambdaQueryWrapper) Wrappers.lambdaQuery().in((v0) -> {
return v0.getId();
}, userIds)).select(new SFunction[]{(v0) -> {
@@ -1034,7 +765,7 @@
return v0.getEmail();
}})).stream().map(user -> {
return new NotifyUserDTO(user.getId(), user.getEmail(), user.getPhone(), this.userOauthService.getUserMiniUuid(user.getId()));
- }).collect(Collectors.toList());
+ }).collect(Collectors.toList());*/
}
@Override // org.springblade.modules.system.service.IUserService
@@ -1042,7 +773,7 @@
public QuCreAccBackMessageVO batchCreateAccount(QuickCreationAccountVO quickCreationAccountVO) {
QuCreAccBackMessageVO quCreAccBackMessageVO = new QuCreAccBackMessageVO();
List<Employee> employeeList = this.employeeService.list();
- Map<String, Employee> employeeMap = (Map) employeeList.stream().filter(s -> {
+ Map<String, Employee> employeeMap = employeeList.stream().filter(s -> {
return Func.isNotEmpty(s.getUserId());
}).collect(Collectors.toMap((v0) -> {
return v0.getUserId();
@@ -1054,7 +785,7 @@
quCreAccBackMessageVO.setFailNums(Integer.valueOf(Integer.parseInt("0")));
return quCreAccBackMessageVO;
}
- List<String> accounts = (List) quickCreationUsers.stream().map((v0) -> {
+ List<String> accounts = quickCreationUsers.stream().map((v0) -> {
return v0.getAccount();
}).collect(Collectors.toList());
String initPassword = ParamCache.getValue(CommonConstant.DEFAULT_PARAM_PASSWORD);
@@ -1062,7 +793,7 @@
String roleIds = quickCreationAccountVO.getRoleId();
if (Func.isNotEmpty(userList)) {
List<QuCreAccBackUserVO> list = new ArrayList<>();
- List<User> alreadyExistsUsers = (List) userList.stream().filter(user -> {
+ List<User> alreadyExistsUsers = userList.stream().filter(user -> {
return accounts.contains(user.getAccount());
}).collect(Collectors.toList());
if (Func.isNotEmpty(alreadyExistsUsers)) {
@@ -1078,12 +809,12 @@
});
}
if (Func.isNotEmpty(list)) {
- List<String> exitsAccounts = (List) list.stream().map((v0) -> {
+ List<String> exitsAccounts = list.stream().map((v0) -> {
return v0.getAccountUser();
}).collect(Collectors.toList());
quCreAccBackMessageVO.setFailNums(Integer.valueOf(list.size()));
quCreAccBackMessageVO.setFailList(list);
- quickCreationUsers = (List) quickCreationUsers.stream().filter(s2 -> {
+ quickCreationUsers = quickCreationUsers.stream().filter(s2 -> {
return !exitsAccounts.contains(s2.getAccount());
}).collect(Collectors.toList());
}
--
Gitblit v1.9.3