From 9097df6b9559b04682e9907d900eb86d5109f84a Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 23 四月 2024 21:23:32 +0800
Subject: [PATCH] 去掉coreboot的无用注释

---
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/EmployeeServiceImpl.java |  573 ++++++++++++++------------------------------------------
 1 files changed, 146 insertions(+), 427 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..ec76d5e 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
@@ -1,26 +1,34 @@
 package com.qianwen.smartman.modules.cps.service.impl;
 
-import cn.hutool.core.util.StrUtil;
-import com.alibaba.excel.write.merge.AbstractMergeStrategy;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-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 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;
 import java.util.Objects;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.alibaba.excel.write.merge.AbstractMergeStrategy;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
+import com.google.common.collect.Lists;
+import com.qianwen.core.excel.util.ExcelUtil;
+import com.qianwen.core.log.exception.ServiceException;
+import com.qianwen.core.mp.base.BaseServiceImpl;
+import com.qianwen.core.oss.model.BladeFile;
+import com.qianwen.core.secure.utils.AuthUtil;
+import com.qianwen.core.tool.utils.DateUtil;
+import com.qianwen.core.tool.utils.Func;
 import com.qianwen.smartman.common.cache.DictCache;
-import com.qianwen.smartman.common.cache.RegionCache;
 import com.qianwen.smartman.common.cache.SysCache;
 import com.qianwen.smartman.common.constant.CommonConstant;
 import com.qianwen.smartman.common.constant.CommonGroupConstant;
@@ -29,18 +37,10 @@
 import com.qianwen.smartman.common.enums.CommonGroupTypeEnum;
 import com.qianwen.smartman.common.enums.DictEnum;
 import com.qianwen.smartman.common.enums.StatusType;
-import com.qianwen.smartman.common.utils.ExtraLambdaQueryWrapper;
 import com.qianwen.smartman.common.utils.Lambda;
 import com.qianwen.smartman.common.utils.MessageUtils;
 import com.qianwen.smartman.common.utils.TreeUtils;
 import com.qianwen.smartman.common.utils.ValidatorUtils;
-import com.qianwen.core.excel.util.ExcelUtil;
-import com.qianwen.core.log.exception.ServiceException;
-import com.qianwen.core.mp.base.BaseServiceImpl;
-import com.qianwen.core.oss.model.BladeFile;
-import com.qianwen.core.secure.utils.AuthUtil;
-import com.qianwen.core.tool.utils.DateUtil;
-import com.qianwen.core.tool.utils.Func;
 import com.qianwen.smartman.modules.cps.convert.EmployeeConvert;
 import com.qianwen.smartman.modules.cps.dto.EmployeeDTO;
 import com.qianwen.smartman.modules.cps.dto.EmployeeNameDTO;
@@ -66,12 +66,10 @@
 import com.qianwen.smartman.modules.system.entity.Post;
 import com.qianwen.smartman.modules.system.service.ICodeGeneratorService;
 import com.qianwen.smartman.modules.system.service.IPostService;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.MultipartFile;
+
+import cn.hutool.core.util.StrUtil;
 
 @Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/service/impl/EmployeeServiceImpl.class */
 public class EmployeeServiceImpl extends BaseServiceImpl<EmployeeMapper, Employee> implements IEmployeeService {
     private static final Logger log = LoggerFactory.getLogger(EmployeeServiceImpl.class);
     private final ICommonGroupService commonGroupService;
@@ -81,365 +79,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;
@@ -450,7 +89,7 @@
         this.postService = postService;
     }
 
-    @Override // org.springblade.modules.cps.service.IEmployeeService
+    @Override 
     @Transactional(rollbackFor = {Exception.class})
     public EmployeeVO submit(EmployeeSubmitVO employeeSubmitVO) {
         if (Func.isEmpty(employeeSubmitVO.getOrganizationId())) {
@@ -475,10 +114,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 +128,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 +147,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 +160,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,25 +168,31 @@
     }
 
     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]));
         }
     }
 
-    @Override // org.springblade.modules.cps.service.IEmployeeService
+    @Override 
     public IPage<EmployeeDTO> selectEmployeePage(IPage<EmployeeDTO> page, EmployeeSelectVO employeeSelectVO) {
         List<Long> organizationIdList = this.commonGroupService.getCommonGroupChildIds(employeeSelectVO.getOrganizationCode(), CommonGroupTypeEnum.ORGANIZATION.getName(), CommonGroupConstant.DEFAULT_CATEGORY);
         return page.setRecords(((EmployeeMapper) this.baseMapper).selectEmployeePage(page, employeeSelectVO, organizationIdList));
     }
 
-    @Override // org.springblade.modules.cps.service.IEmployeeService
+    @Override 
     @Transactional(rollbackFor = {Exception.class})
     public BladeFile importEmployee(List<EmployeeImport> data, String organizationCode) {
         if (Func.isEmpty(data)) {
@@ -548,9 +205,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);
@@ -565,7 +225,7 @@
             }
         }
         if (!flag.booleanValue()) {
-            MultipartFile multipartFile = ExcelUtil.exportFillTemplateToMultipartFile(ExcelConstant.DIRECTORY + "employeeFailTemplate" + ExcelConstant.SUFFIX, MessageUtils.message("excel.import.failed.report.name", new Object[0]) + ExcelConstant.SUFFIX, "鍛樺伐淇℃伅琛�", (List) data.stream().filter(x2 -> {
+            MultipartFile multipartFile = ExcelUtil.exportFillTemplateToMultipartFile(ExcelConstant.DIRECTORY + "employeeFailTemplate" + ExcelConstant.SUFFIX, MessageUtils.message("excel.import.failed.report.name", new Object[0]) + ExcelConstant.SUFFIX, "鍛樺伐淇℃伅琛�",data.stream().filter(x2 -> {
                 return Func.isNotEmpty(x2.getFailReason());
             }).collect(Collectors.toList()), (Object) null, (AbstractMergeStrategy) null);
             BladeFile bladeFile = this.ossBuilder.tempTemplate().putFile(multipartFile.getOriginalFilename(), multipartFile);
@@ -578,7 +238,7 @@
         return null;
     }
 
-    @Override // org.springblade.modules.cps.service.IEmployeeService
+    @Override 
     @Transactional(rollbackFor = {Exception.class})
     public Boolean changeOrganization(List<Long> employeeIds, Long organizationId) {
         if (Func.isEmpty(organizationId)) {
@@ -595,70 +255,92 @@
             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
+    @Override 
     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
+    @Override 
     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
+    @Override 
     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);
     }
 
-    @Override // org.springblade.modules.cps.service.IEmployeeService
+    @Override 
     public List<GroupTreeVO> getUnbindEmployeeList(String employeeId) {
         CommonGroupTypeVO commonGroupType = new CommonGroupTypeVO().setGroupType(CommonGroupTypeEnum.ORGANIZATION.getName()).setGroupCategory(CommonGroupConstant.DEFAULT_CATEGORY);
         List<GroupTreeVO> list = ((EmployeeMapper) this.baseMapper).getUnbindEmployeeList(employeeId);
         return TreeUtils.allGroupTree(commonGroupType, list);
     }
 
-    @Override // org.springblade.modules.cps.service.IEmployeeService
+    @Override 
     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 +382,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 +454,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 +474,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);
@@ -801,8 +493,13 @@
         }
     }
 
-    @Override // org.springblade.modules.cps.service.IEmployeeService
+    @Override 
     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,10 +510,10 @@
             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
+    @Override 
     public Boolean removeEmployee(List<Long> ids, Integer type) {
         if (StatusType.REMOVE.getType().equals(type)) {
             return Boolean.valueOf(removeByIds(ids));
@@ -824,41 +521,47 @@
         return Boolean.valueOf(changeStatus(ids, CommonConstant.DEACTIVATE));
     }
 
-    @Override // org.springblade.modules.cps.service.IEmployeeService
+    @Override 
     public List<EmployeeDTO> selectEmployeeList(EmployeeSelectVO employeeSelectVO) {
         List<Long> organizationIdList = this.commonGroupService.getCommonGroupChildIds(employeeSelectVO.getOrganizationCode(), CommonGroupTypeEnum.ORGANIZATION.getName(), CommonGroupConstant.DEFAULT_CATEGORY);
         return ((EmployeeMapper) this.baseMapper).selectEmployeeList(employeeSelectVO, organizationIdList);
     }
 
-    @Override // org.springblade.modules.cps.service.IEmployeeService
+    @Override 
     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);
         }
-        return new ArrayList();
+        return new ArrayList<>();
     }
 
-    @Override // org.springblade.modules.cps.service.IEmployeeService
+    @Override
     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())));
@@ -869,41 +572,50 @@
         return TreeUtils.allGroupTree(commonGroupType, treeList);
     }
 
-    @Override // org.springblade.modules.cps.service.IEmployeeService
+    @Override 
     public Boolean updatePart(EmployeeUpdatePartVO employeeUpdatePartVO) {
         if (Func.isNotEmpty(employeeUpdatePartVO.getPinCode())) {
             Employee employee = (Employee) getById(employeeUpdatePartVO.getId());
             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;
         }
     }
 
-    @Override // org.springblade.modules.cps.service.IEmployeeService
+    @Override 
     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);
@@ -914,15 +626,17 @@
         return result;
     }
 
-    @Override // org.springblade.modules.cps.service.IEmployeeService
+    @Override 
     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);
     }
 
-    @Override // org.springblade.modules.cps.service.IEmployeeService
+    @Override 
     public HierarchyVO getEmployeeHierarchy(Long employeeId) {
         HierarchyVO hierarchy = new HierarchyVO();
         Employee employee = (Employee) getById(employeeId);
@@ -935,13 +649,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