From 80d01261e84d3c0f55cf2d17a56539b5c27a8485 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 27 三月 2024 22:45:27 +0800
Subject: [PATCH] 第三批编译错误修改
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/EmployeeServiceImpl.java | 490 +++++++++++------------------------------------------
1 files changed, 106 insertions(+), 384 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/EmployeeServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/EmployeeServiceImpl.java
index d0b937c..812de99 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/EmployeeServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/EmployeeServiceImpl.java
@@ -11,6 +11,7 @@
import com.google.common.collect.Lists;
import java.lang.invoke.SerializedLambda;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -81,365 +82,6 @@
private final ICodeGeneratorService codeGeneratorService;
private final IPostService postService;
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -1492577373:
- if (implMethodName.equals("getGroupType")) {
- z = true;
- break;
- }
- break;
- case -1460243263:
- if (implMethodName.equals("getPostName")) {
- z = true;
- break;
- }
- break;
- case -1249349403:
- if (implMethodName.equals("getTel")) {
- z = true;
- break;
- }
- break;
- case -129715105:
- if (implMethodName.equals("getEmployeeId")) {
- z = true;
- break;
- }
- break;
- case -75622813:
- if (implMethodName.equals("getCode")) {
- z = true;
- break;
- }
- break;
- case 98245393:
- if (implMethodName.equals("getId")) {
- z = true;
- break;
- }
- break;
- case 467811564:
- if (implMethodName.equals("getPinCode")) {
- z = true;
- break;
- }
- break;
- case 517353092:
- if (implMethodName.equals("getItemId")) {
- 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 977687216:
- if (implMethodName.equals("getJobNumber")) {
- z = true;
- break;
- }
- break;
- case 985326823:
- if (implMethodName.equals("getGroupCategory")) {
- z = true;
- break;
- }
- break;
- case 1071464927:
- if (implMethodName.equals("getCreateTime")) {
- z = false;
- break;
- }
- break;
- case 1330288580:
- if (implMethodName.equals("getGroupId")) {
- z = true;
- break;
- }
- break;
- case 1952444902:
- if (implMethodName.equals("getEmail")) {
- 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/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/util/Date;")) {
- return (v0) -> {
- return v0.getCreateTime();
- };
- }
- 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();
- };
- }
- 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/modules/cps/entity/CommonGroupOfItem") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getGroupType();
- };
- }
- 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/CommonGroup") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getGroupType();
- };
- }
- 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.getStatus();
- };
- }
- 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();
- };
- }
- 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();
- };
- }
- 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();
- };
- }
- 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();
- };
- }
- 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();
- };
- }
- 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();
- };
- }
- 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/modules/cps/entity/Employee") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getTel();
- };
- }
- 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.getTel();
- };
- }
- 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/cps/entity/CommonGroupOfItem") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getGroupId();
- };
- }
- 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/cps/entity/Employee") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getPinCode();
- };
- }
- 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/cps/entity/CommonGroupOfItem") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getItemId();
- };
- }
- 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/CommonGroupOfItem") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getItemId();
- };
- }
- 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/cps/entity/Employee") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getJobNumber();
- };
- }
- 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.getJobNumber();
- };
- }
- 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.getJobNumber();
- };
- }
- 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/Post") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getPostName();
- };
- }
- 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/cps/entity/Employee") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getEmail();
- };
- }
- 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.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/cps/entity/EmployeePost") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getEmployeeId();
- };
- }
- 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/cps/entity/Employee") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCode();
- };
- }
- 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/CommonGroup") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCode();
- };
- }
- 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/cps/entity/CommonGroupOfItem") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getGroupCategory();
- };
- }
- 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/CommonGroup") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getGroupCategory();
- };
- }
- 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/cps/entity/Employee") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- 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/cps/entity/Employee") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- 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/cps/entity/Employee") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- 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/cps/entity/Employee") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- 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/cps/entity/Employee") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- 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/cps/entity/Employee") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- 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/cps/entity/Employee") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getUserId();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public EmployeeServiceImpl(final ICommonGroupService commonGroupService, final ICommonGroupOfItemService commonGroupOfItemService, final IEmployeePostService employeePostService, final OssBuilder ossBuilder, final ICodeGeneratorService codeGeneratorService, final IPostService postService) {
this.commonGroupService = commonGroupService;
@@ -475,10 +117,10 @@
return v0.getEmail();
};
String conditionValue = isMobile.booleanValue() ? employeeSubmitVO.getTel() : employeeSubmitVO.getEmail();
- LambdaQueryWrapper<Employee> wrapper = ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq(column, conditionValue)).ne(isUpdate.booleanValue(), (v0) -> {
- return v0.getId();
- }, employeeSubmitVO.getId());
- Employee employee = (Employee) getOne(wrapper, Boolean.FALSE.booleanValue());
+
+ LambdaQueryWrapper<Employee> wrapper = Wrappers.<Employee>lambdaQuery().eq(column, conditionValue).ne(isUpdate.booleanValue(), Employee::getId, employeeSubmitVO.getId());
+
+ Employee employee = (Employee) getOne(wrapper, false);
if (!Objects.isNull(employee)) {
String message = MessageUtils.message("cps.employee.mobile.already.exists", new Object[0]);
Object[] objArr = new Object[2];
@@ -489,13 +131,18 @@
}
private void checkUnable(EmployeeSubmitVO employeeSubmitVO) {
+ Employee employee = (Employee)getOne(Lambda.<Employee>create()
+ .eq(Employee::getJobNumber, employeeSubmitVO.getJobNumber())
+ .ne(Func.isNotEmpty(employeeSubmitVO.getId()), Employee::getId, employeeSubmitVO.getId())
+ .eq(Employee::getStatus, CommonConstant.DEACTIVATE)
+ .limit());/*
Employee employee = (Employee) getOne(((ExtraLambdaQueryWrapper) ((ExtraLambdaQueryWrapper) Lambda.create().eq((v0) -> {
return v0.getJobNumber();
}, employeeSubmitVO.getJobNumber())).ne(Func.isNotEmpty(employeeSubmitVO.getId()), (v0) -> {
return v0.getId();
}, employeeSubmitVO.getId()).eq((v0) -> {
return v0.getStatus();
- }, CommonConstant.DEACTIVATE)).limit());
+ }, CommonConstant.DEACTIVATE)).limit());*/
if (employee != null) {
throw new ServiceException(MessageUtils.message("cps.employee.name.exist.same.stop", new Object[0]));
}
@@ -503,6 +150,12 @@
private void checkEmployee(Boolean update, EmployeeSubmitVO employeeSubmitVO) {
if (Func.isNotEmpty(employeeSubmitVO.getJobNumber())) {
+ Employee employee = getOne(Lambda.<Employee>create()
+ .eq(Employee::getJobNumber, employeeSubmitVO.getJobNumber())
+ .ne(update.booleanValue(), Employee::getId, employeeSubmitVO.getId())
+ .eq(Employee::getStatus, CommonConstant.ENABLE)
+ .limit());
+ /*
Employee employee = (Employee) getOne(((ExtraLambdaQueryWrapper) ((ExtraLambdaQueryWrapper) Lambda.create().eq((v0) -> {
return v0.getJobNumber();
}, employeeSubmitVO.getJobNumber())).ne(update.booleanValue(), (v0) -> {
@@ -510,6 +163,7 @@
}, employeeSubmitVO.getId()).eq((v0) -> {
return v0.getStatus();
}, CommonConstant.ENABLE)).limit());
+ */
if (Func.isNotEmpty(employee)) {
throw new ServiceException(MessageUtils.message("cps.employee.job.number.already.exists", new Object[0]));
}
@@ -517,13 +171,19 @@
}
private void validCode(String code, Long id) {
+ Employee employee = getOne(Lambda.<Employee>create()
+ .eq(Employee::getCode, code)
+ .ne(Func.isNotEmpty(id), Employee::getId, id)
+ .eq(Employee::getStatus, CommonConstant.ENABLE)
+ .limit());
+ /*
Employee employee = (Employee) getOne(((ExtraLambdaQueryWrapper) ((ExtraLambdaQueryWrapper) Lambda.create().eq((v0) -> {
return v0.getCode();
}, code)).ne(Func.isNotEmpty(id), (v0) -> {
return v0.getId();
}, id).eq((v0) -> {
return v0.getStatus();
- }, CommonConstant.ENABLE)).limit());
+ }, CommonConstant.ENABLE)).limit());*/
if (Func.isNotEmpty(employee)) {
throw new ServiceException(MessageUtils.message("cps.employee.code.already.exists", new Object[0]));
}
@@ -548,9 +208,12 @@
HashMap<String, Long> commonGroupNameStatusMap = this.commonGroupService.getCommonGroupNameMap(organizationCode, CommonGroupTypeEnum.ORGANIZATION.getName(), CommonGroupConstant.DEFAULT_CATEGORY, CommonConstant.ENABLE);
HashMap<String, Object> jobNumberMap = new HashMap<>(16);
HashMap<String, Object> telMap = new HashMap<>(16);
+
+ List<Employee> employeeList = list(Wrappers.<Employee>lambdaQuery().eq(Employee::getStatus, CommonConstant.ENABLE));
+ /*
List<Employee> employeeList = list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getStatus();
- }, CommonConstant.ENABLE));
+ }, CommonConstant.ENABLE));*/
if (Func.isNotEmpty(employeeList)) {
employeeList.forEach(x -> {
jobNumberMap.put(x.getJobNumber(), null);
@@ -595,44 +258,60 @@
commonGroupOfItemList.add(commonGroupOfItem);
}
updateBatchById(employeeList);
+
+ this.commonGroupOfItemService.remove(Wrappers.<CommonGroupOfItem>query().lambda()
+ .in(CommonGroupOfItem::getItemId, employeeIds));
+
+ /*
this.commonGroupOfItemService.remove((Wrapper) Wrappers.query().lambda().in((v0) -> {
return v0.getItemId();
- }, employeeIds));
+ }, employeeIds));*/
this.commonGroupOfItemService.saveBatch(commonGroupOfItemList);
return Boolean.TRUE;
}
@Override // org.springblade.modules.cps.service.IEmployeeService
public Boolean changeUserId(Long employeeId, Long oldEmployeeId, Long userId) {
+ update(Wrappers.<Employee>lambdaUpdate().set(Employee::getUserId, null).eq(Employee::getId, oldEmployeeId));
+ /*
update((Wrapper) ((LambdaUpdateWrapper) Wrappers.lambdaUpdate().set((v0) -> {
return v0.getUserId();
}, (Object) null)).eq((v0) -> {
return v0.getId();
- }, oldEmployeeId));
+ }, oldEmployeeId));*/
if (Func.isNotEmpty(employeeId)) {
+ return Boolean.valueOf(update(Wrappers.<Employee>lambdaUpdate().set(Employee::getUserId, userId).eq(Employee::getId, employeeId)));
+ /*
return Boolean.valueOf(update((Wrapper) ((LambdaUpdateWrapper) Wrappers.lambdaUpdate().set((v0) -> {
return v0.getUserId();
}, userId)).eq((v0) -> {
return v0.getId();
- }, employeeId)));
+ }, employeeId)));*/
}
return true;
}
@Override // org.springblade.modules.cps.service.IEmployeeService
public Boolean updateUserIdIsNull(List<String> userIdList) {
+
+ return Boolean.valueOf(update(Wrappers.<Employee>lambdaUpdate().set(Employee::getUserId, null).in(Employee::getUserId, userIdList)));
+ /*
return Boolean.valueOf(update((Wrapper) ((LambdaUpdateWrapper) Wrappers.lambdaUpdate().set((v0) -> {
return v0.getUserId();
}, (Object) null)).in((v0) -> {
return v0.getUserId();
- }, userIdList)));
+ }, userIdList)));*/
}
@Override // org.springblade.modules.cps.service.IEmployeeService
public Boolean checkUserIsBindEmployee(String userIds) {
+ long count = count(Wrappers.<Employee>query().lambda()
+ .in(Employee::getUserId, Func.toLongList(userIds)));
+ /*
long count = count((Wrapper) Wrappers.query().lambda().in((v0) -> {
return v0.getUserId();
}, Func.toLongList(userIds)));
+ */
return Boolean.valueOf(count > 0);
}
@@ -645,20 +324,26 @@
@Override // org.springblade.modules.cps.service.IEmployeeService
public Employee getByUserId(Long userId) {
+ return (Employee)getOne(Wrappers.<Employee>query().lambda()
+ .eq(Employee::getUserId, userId));
+ /*
return (Employee) getOne((Wrapper) Wrappers.query().lambda().eq((v0) -> {
return v0.getUserId();
- }, userId));
+ }, userId));*/
}
private void checkImportEmployee(EmployeeImport employeeImport, HashMap<String, Long> commonGroupNameMap, HashMap<String, Object> jobNumberMap, HashMap<String, Object> telMap, HashMap<String, Long> commonGroupNameStatusMap) {
Map<String, Employee> stopEmployeeMap = null;
+
+ List<Employee> list = list(Wrappers.<Employee>lambdaQuery().eq(Employee::getStatus, CommonConstant.DEACTIVATE));
+ /*
List<Employee> list = list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getStatus();
- }, CommonConstant.DEACTIVATE));
+ }, CommonConstant.DEACTIVATE));*/
if (Func.isNotEmpty(list)) {
- stopEmployeeMap = (Map) list.stream().collect(Collectors.toMap((v0) -> {
+ stopEmployeeMap = list.stream().collect(Collectors.toMap((v0) -> {
return v0.getJobNumber();
- }, Function.identity(), k1, k2 -> {
+ }, Function.identity(), (k1, k2) -> {
return k1;
}));
}
@@ -700,11 +385,16 @@
}
employeeImport.setStatus(Integer.valueOf(Integer.parseInt(status)));
if (Func.isNotEmpty(employeeImport.getPostName())) {
+ Post post = this.postService.getOne(Lambda.<Post>create()
+ .eq(Post::getPostName, employeeImport.getPostName())
+ .eq(Post::getStatus, CommonConstant.DEACTIVATE)
+ .limit());
+ /*
Post post = (Post) this.postService.getOne(((ExtraLambdaQueryWrapper) ((ExtraLambdaQueryWrapper) Lambda.create().eq((v0) -> {
return v0.getPostName();
}, employeeImport.getPostName())).eq((v0) -> {
return v0.getStatus();
- }, CommonConstant.DEACTIVATE)).limit());
+ }, CommonConstant.DEACTIVATE)).limit());*/
if (post != null) {
employeeImport.setFailReason(MessageUtils.message("cps.post.name.already.exist.stop.status", new Object[0]));
return;
@@ -767,9 +457,12 @@
private void submitEmployeeOrganization(Boolean update, Long employeeId, String organizationId) {
if (update.booleanValue()) {
+ this.commonGroupOfItemService.remove(Wrappers.<CommonGroupOfItem>lambdaQuery().eq(CommonGroupOfItem::getItemId, employeeId));
+ /*
this.commonGroupOfItemService.remove((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getItemId();
}, employeeId));
+ */
}
if (Func.isNotEmpty(organizationId)) {
List<Long> organizationIdList = Func.toLongList(organizationId);
@@ -784,9 +477,11 @@
private void submitEmployeePost(Boolean update, Long employeeId, String postId) {
if (update.booleanValue()) {
+ this.employeePostService.remove(Wrappers.<EmployeePost>lambdaQuery().eq(EmployeePost::getEmployeeId, employeeId));
+ /*
this.employeePostService.remove((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getEmployeeId();
- }, employeeId));
+ }, employeeId));*/
}
if (Func.isNotEmpty(postId)) {
List<Long> postIdList = Func.toLongList(postId);
@@ -803,6 +498,11 @@
@Override // org.springblade.modules.cps.service.IEmployeeService
public List<NotifyUserDTO> getNotifySubscriberList(List<String> userIds) {
+ return (List<NotifyUserDTO>)list(Wrappers.<Employee>lambdaQuery().in(Employee::getId, userIds)
+ .select(Employee::getId, Employee::getTel, Employee::getEmail )).stream()
+ .map(user -> new NotifyUserDTO(user.getId(), user.getEmail(), user.getTel(), null))
+ .collect(Collectors.toList());
+ /*
return (List) list(((LambdaQueryWrapper) Wrappers.lambdaQuery().in((v0) -> {
return v0.getId();
}, userIds)).select(new SFunction[]{(v0) -> {
@@ -813,7 +513,7 @@
return v0.getEmail();
}})).stream().map(user -> {
return new NotifyUserDTO(user.getId(), user.getEmail(), user.getTel(), null);
- }).collect(Collectors.toList());
+ }).collect(Collectors.toList());*/
}
@Override // org.springblade.modules.cps.service.IEmployeeService
@@ -833,14 +533,17 @@
@Override // org.springblade.modules.cps.service.IEmployeeService
public List<Employee> listByOrgIds(List<Long> orgIds) {
if (Func.isNotEmpty(orgIds)) {
+ List<CommonGroupOfItem> list = this.commonGroupOfItemService.list(Wrappers.<CommonGroupOfItem>lambdaQuery().in(CommonGroupOfItem::getGroupId, orgIds).eq(CommonGroupOfItem::getGroupType, CommonGroupTypeEnum.ORGANIZATION.getName())
+ .eq(CommonGroupOfItem::getGroupCategory, CommonGroupConstant.DEFAULT_CATEGORY));
+ /*
List<CommonGroupOfItem> list = this.commonGroupOfItemService.list((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().in((v0) -> {
return v0.getGroupId();
}, orgIds)).eq((v0) -> {
return v0.getGroupType();
}, CommonGroupTypeEnum.ORGANIZATION.getName())).eq((v0) -> {
return v0.getGroupCategory();
- }, CommonGroupConstant.DEFAULT_CATEGORY));
- List<Long> empIds = (List) list.stream().map((v0) -> {
+ }, CommonGroupConstant.DEFAULT_CATEGORY));*/
+ List<Long> empIds = list.stream().map((v0) -> {
return v0.getItemId();
}).collect(Collectors.toList());
return listByIds(empIds);
@@ -852,13 +555,16 @@
public List<GroupTreeVO> tree() {
List<GroupTreeVO> treeList = Lists.newArrayList();
CommonGroupTypeVO commonGroupType = new CommonGroupTypeVO().setGroupType(CommonGroupTypeEnum.ORGANIZATION.getName()).setGroupCategory(CommonGroupConstant.DEFAULT_CATEGORY);
+ List<Employee> list = list(Wrappers.<Employee>lambdaQuery().eq(Employee::getStatus, CommonConstant.ENABLE)
+ .orderByDesc(Arrays.asList(Employee::getCreateTime, Employee::getId) ));
+ /*
List<Employee> list = list((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getStatus();
}, CommonConstant.ENABLE)).orderByDesc((v0) -> {
return v0.getCreateTime();
}, new SFunction[]{(v0) -> {
return v0.getId();
- }}));
+ }}));*/
list.forEach(x -> {
GroupTreeVO groupTree = EmployeeConvert.INSTANCE.convertToTree(x);
groupTree.setParentId(Long.valueOf(Func.toLong(x.getOrganizationId())));
@@ -876,22 +582,28 @@
if (!employeeUpdatePartVO.getPinCode().equals(employee.getPinCode())) {
throw new ServiceException(MessageUtils.message("cps.employee.ori.pin.error", new Object[0]));
}
+ return Boolean.valueOf(update(Wrappers.<Employee>lambdaUpdate().set(Employee::getPinCode, employeeUpdatePartVO.getNewPinCode()).eq(Employee::getId, employeeUpdatePartVO.getId())));
+ /*
return Boolean.valueOf(update((Wrapper) ((LambdaUpdateWrapper) Wrappers.lambdaUpdate().set((v0) -> {
return v0.getPinCode();
}, employeeUpdatePartVO.getNewPinCode())).eq((v0) -> {
return v0.getId();
- }, employeeUpdatePartVO.getId())));
+ }, employeeUpdatePartVO.getId())));*/
} else if (Func.isNotEmpty(employeeUpdatePartVO.getJobNumber())) {
EmployeeSubmitVO employeeSubmitVO = new EmployeeSubmitVO();
employeeSubmitVO.setId(employeeUpdatePartVO.getId());
employeeSubmitVO.setJobNumber(employeeUpdatePartVO.getJobNumber());
checkEmployee(true, employeeSubmitVO);
checkUnable(employeeSubmitVO);
+
+ return Boolean.valueOf(update(Wrappers.<Employee>lambdaUpdate().set(Employee::getJobNumber, employeeUpdatePartVO.getJobNumber()).eq(Employee::getId, employeeUpdatePartVO.getId())));
+ /*
return Boolean.valueOf(update((Wrapper) ((LambdaUpdateWrapper) Wrappers.lambdaUpdate().set((v0) -> {
return v0.getJobNumber();
}, employeeUpdatePartVO.getJobNumber())).eq((v0) -> {
return v0.getId();
}, employeeUpdatePartVO.getId())));
+ */
} else {
return false;
}
@@ -901,9 +613,12 @@
public EmployeeNameDTO getEmployeeNameMap() {
HashMap<String, Long> employeeNameMap = new HashMap<>(16);
HashMap<String, Long> repeatEmployeeNameMap = new HashMap<>(16);
+
+ List<Employee> list = list(Wrappers.<Employee>lambdaQuery().eq(Employee::getStatus, CommonConstant.ENABLE));
+ /*
List<Employee> list = list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getStatus();
- }, CommonConstant.ENABLE));
+ }, CommonConstant.ENABLE));*/
list.forEach(x -> {
if (employeeNameMap.containsKey(x.getName())) {
repeatEmployeeNameMap.put(x.getName(), null);
@@ -916,9 +631,11 @@
@Override // org.springblade.modules.cps.service.IEmployeeService
public EmployeeVO currentEmployee(Long userId) {
+ Employee one = (Employee)getOne(Wrappers.<Employee>lambdaQuery().like(Employee::getUserId, userId));
+ /*
Employee one = (Employee) getOne((Wrapper) Wrappers.lambdaQuery().like((v0) -> {
return v0.getUserId();
- }, userId));
+ }, userId));*/
return EmployeeConvert.INSTANCE.convert(one);
}
@@ -935,13 +652,18 @@
CommonGroup currentNode = (CommonGroup) this.commonGroupService.getById(organizationId);
List<String> codeList = getCodeHierarchyList(currentNode.getCode());
if (Func.isNotEmpty(codeList)) {
+ List<CommonGroup> list = this.commonGroupService.list(Wrappers.<CommonGroup>lambdaQuery().eq(CommonGroup::getGroupType, CommonGroupTypeEnum.ORGANIZATION.getName())
+ .eq(CommonGroup::getGroupCategory, CommonGroupConstant.DEFAULT_CATEGORY)
+ .in(CommonGroup::getCode, codeList)
+ .last("order by length(code)"));
+ /*
List<CommonGroup> list = this.commonGroupService.list((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getGroupType();
}, CommonGroupTypeEnum.ORGANIZATION.getName())).eq((v0) -> {
return v0.getGroupCategory();
}, CommonGroupConstant.DEFAULT_CATEGORY)).in((v0) -> {
return v0.getCode();
- }, codeList)).last("order by length(code)"));
+ }, codeList)).last("order by length(code)"));*/
list.forEach(x -> {
idList.add(x.getId());
sb.append(x.getName() + "/");
--
Gitblit v1.9.3