From a36d93e531c292240dc59cb8e712b2eca21a4066 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 01 四月 2024 22:13:06 +0800
Subject: [PATCH] sync模块修复

---
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/sync/message/sse/SseEmitterServer.java           |    4 
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/MachineServiceImpl.java         |   59 +-
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/sync/service/impl/DingEventServiceImpl.java      |  370 ++++-----------
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MachineController.java            |   29 
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/sync/api/QyWechatApi.java                        |    4 
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/sync/service/impl/WechatSyncServiceImpl.java     |  232 ++-------
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/sync/service/impl/DingSyncServiceImpl.java       |  341 ++++++--------
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/sync/service/impl/OuterAppConfigServiceImpl.java |  109 +---
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/sync/service/impl/WechatCallbackServiceImpl.java |  213 ++-------
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/sync/util/CodeUtil.java                          |    4 
 10 files changed, 449 insertions(+), 916 deletions(-)

diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MachineController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MachineController.java
index b5927c2..094b900 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MachineController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MachineController.java
@@ -1,16 +1,17 @@
 package com.qianwen.smartman.modules.cps.controller;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import java.util.List;
+
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import java.lang.invoke.SerializedLambda;
-import java.util.List;
-import com.qianwen.smartman.common.cache.RegionCache;
-import com.qianwen.smartman.common.constant.CommonConstant;
 import com.qianwen.core.mp.support.Query;
 import com.qianwen.core.oss.model.BladeFile;
 import com.qianwen.core.scanner.modular.annotation.DeleteResource;
@@ -22,6 +23,8 @@
 import com.qianwen.core.tenant.annotation.NonDS;
 import com.qianwen.core.tool.api.R;
 import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.cache.RegionCache;
+import com.qianwen.smartman.common.constant.CommonConstant;
 import com.qianwen.smartman.modules.cps.convert.MachineConvert;
 import com.qianwen.smartman.modules.cps.entity.Machine;
 import com.qianwen.smartman.modules.cps.service.IMachineService;
@@ -34,12 +37,10 @@
 import com.qianwen.smartman.modules.cps.vo.MachineVO;
 import com.qianwen.smartman.modules.resource.enums.TemplateEnum;
 import com.qianwen.smartman.modules.resource.service.ISystemResourceService;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 
 @Api(value = "鏈哄櫒绠＄悊", tags = {"鏈哄櫒绠＄悊"})
 @RestController
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/MachineServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/MachineServiceImpl.java
index 0e52c7d..c25a2bc 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/MachineServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/MachineServiceImpl.java
@@ -1,19 +1,8 @@
 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.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.google.common.collect.Lists;
-import java.lang.invoke.SerializedLambda;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -25,10 +14,31 @@
 import java.util.UUID;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+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.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.google.common.collect.Lists;
+import com.qianwen.core.cache.utils.CacheUtil;
+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.mp.support.Condition;
+import com.qianwen.core.mp.support.Query;
+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.cps.WorkstationCache;
 import com.qianwen.smartman.common.cache.cps.WorkstationOfMachineCache;
 import com.qianwen.smartman.common.constant.CommonConstant;
@@ -42,16 +52,6 @@
 import com.qianwen.smartman.common.enums.WcsDataTypeEnums;
 import com.qianwen.smartman.common.utils.ListUtils;
 import com.qianwen.smartman.common.utils.MessageUtils;
-import com.qianwen.core.cache.utils.CacheUtil;
-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.mp.support.Condition;
-import com.qianwen.core.mp.support.Query;
-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.MachineConvert;
 import com.qianwen.smartman.modules.cps.convert.WorkstationWcsConvert;
 import com.qianwen.smartman.modules.cps.dto.DeviceMaintainInDTO;
@@ -98,11 +98,8 @@
 import com.qianwen.smartman.modules.tpm.enums.MetaTypeEnum;
 import com.qianwen.smartman.modules.tpm.enums.RepairRecordEnum;
 import com.qianwen.smartman.modules.tpm.service.IMaintainPlanService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-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/MachineServiceImpl.class */
@@ -289,7 +286,7 @@
         Long machineTypeId = machineSelectVO.getMachineTypeId();
         Long groupId = machineSelectVO.getGroupId();
         Integer status = machineSelectVO.getStatus();
-        IPage<MachineListVO> page = ((MachineMapper) this.baseMapper).pageMachine(Condition.getPage(query), machineName, machineCode, machineTypeId, groupId, CommonGroupConstant.ALL_MACHINE_ID, status == null ? CommonConstant.ENABLE : status);
+        IPage<MachineListVO> page = this.baseMapper.pageMachine(Condition.getPage(query), machineName, machineCode, machineTypeId, groupId, CommonGroupConstant.ALL_MACHINE_ID, status == null ? CommonConstant.ENABLE : status);
         List<MachineListVO> records = page.getRecords();
         List<MachineListVO> collect = records.stream().peek(c -> {
             c.setMachineUseStatusName(DictCache.getValue(DictEnum.MACHINE_USE_STATUS.getName(), c.getMachineUseStatus()));
@@ -399,7 +396,7 @@
     @Override // org.springblade.modules.cps.service.IMachineService
     public void updateDeviceMaintainStatus(Long deviceId, Integer status, Long planId, LocalDateTime nextMaintainTime) {
         List<MaintainPlan> checkList = checkExistPlanStatus(deviceId, null);
-        List<MaintainPlan> checkTimeList = (List) checkList.stream().sorted(Comparator.comparing((v0) -> {
+        List<MaintainPlan> checkTimeList = checkList.stream().sorted(Comparator.comparing((v0) -> {
             return v0.getMaintainDate();
         })).collect(Collectors.toList());
         DeviceMaintainInDTO deviceMaintainInDTO = new DeviceMaintainInDTO();
@@ -432,7 +429,7 @@
     @Override // org.springblade.modules.cps.service.IMachineService
     public void updateDeviceMaintainStatus(Long deviceId, Long planId, LocalDateTime lastMaintainTime) {
         List<MaintainPlan> checkList = checkExistPlanStatus(deviceId, null);
-        List<MaintainPlan> checkTimeList = (List) checkList.stream().sorted(Comparator.comparing((v0) -> {
+        List<MaintainPlan> checkTimeList =  checkList.stream().sorted(Comparator.comparing((v0) -> {
             return v0.getMaintainDate();
         })).collect(Collectors.toList());
         DeviceMaintainInDTO deviceMaintainInDTO = new DeviceMaintainInDTO();
@@ -466,7 +463,7 @@
     @Override // org.springblade.modules.cps.service.IMachineService
     public BladeFile exportMachine(MachineSelectVO vo) {
         List<MachineDetailVO> vos = ((MachineMapper) this.baseMapper).listMachineDetail(vo.getMachineName(), vo.getMachineCode(), vo.getMachineTypeId(), vo.getGroupId(), CommonGroupConstant.ALL_MACHINE_ID, vo.getStatus());
-        List<MachineDetailVO> list = (List) vos.stream().peek(c -> {
+        List<MachineDetailVO> list = vos.stream().peek(c -> {
             c.setMachineLifeStatusName(DictCache.getValue(DictEnum.MACHINE_LIFE_STATUS.getName(), c.getMachineLifeStatus()));
             c.setManagementClassName(DictCache.getValue(DictEnum.MACHINE_MANAGEMENT_CLASS, c.getManagementClass()));
             c.setMachineUseStatusName(DictCache.getValue(DictEnum.MACHINE_USE_STATUS.getName(), c.getMachineUseStatus()));
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/sync/api/QyWechatApi.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/sync/api/QyWechatApi.java
index 9357418..c11f216 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/sync/api/QyWechatApi.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/sync/api/QyWechatApi.java
@@ -245,9 +245,9 @@
             throw new ServiceException(setResultCode(MessageUtils.message("sync.qy.login.invalid.code", new Object[0]), 400));
         }
         if (errCode.intValue() == 60020) {
-            throw new ServiceException(setResultCode(MessageUtils.message("sync.qy.ip.trust", new Object[0]) + SystemPropertyUtils.VALUE_SEPARATOR + errMsg, 400));
+            throw new ServiceException(setResultCode(MessageUtils.message("sync.qy.ip.trust", new Object[0]) + ":" + errMsg, 400));
         }
-        throw new ServiceException(setResultCode(MessageUtils.message("sync.qy.api.error", new Object[0]) + SystemPropertyUtils.VALUE_SEPARATOR + errMsg, 400));
+        throw new ServiceException(setResultCode(MessageUtils.message("sync.qy.api.error", new Object[0]) + ":" + errMsg, 400));
     }
 
     private static IResultCode setResultCode(final String errMsg, final Integer code) {
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/sync/message/sse/SseEmitterServer.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/sync/message/sse/SseEmitterServer.java
index a83b7b5..3da93cb 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/sync/message/sse/SseEmitterServer.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/sync/message/sse/SseEmitterServer.java
@@ -17,7 +17,7 @@
 /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/sync/message/sse/SseEmitterServer.class */
 public class SseEmitterServer {
     private static final Logger log = LoggerFactory.getLogger(SseEmitterServer.class);
-    private static final Map<String, SseEmitter> SSE_CACHE = new ConcurrentHashMap();
+    private static final Map<String, SseEmitter> SSE_CACHE = new ConcurrentHashMap<>();
 
     public SseEmitter createSseConnect(String clientId) {
         if (StrUtil.isEmpty(clientId)) {
@@ -69,7 +69,7 @@
     }
 
     public void sendAll(Object data, String eventId) {
-        SSE_CACHE.forEach(k, v -> {
+        SSE_CACHE.forEach((k, v) -> {
             sendMsg(k, data, eventId);
         });
     }
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/sync/service/impl/DingEventServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/sync/service/impl/DingEventServiceImpl.java
index b76c96a..1db9886 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/sync/service/impl/DingEventServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/sync/service/impl/DingEventServiceImpl.java
@@ -1,12 +1,21 @@
 package com.qianwen.smartman.modules.sync.service.impl;
 
-import cn.hutool.core.lang.Snowflake;
-import cn.hutool.core.util.IdUtil;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.dingtalk.api.DefaultDingTalkClient;
 import com.dingtalk.api.request.OapiGettokenRequest;
@@ -17,22 +26,12 @@
 import com.dingtalk.api.response.OapiRoleGetroleResponse;
 import com.dingtalk.api.response.OapiV2DepartmentGetResponse;
 import com.dingtalk.api.response.OapiV2UserGetResponse;
-import java.lang.invoke.SerializedLambda;
-import java.time.Duration;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.qianwen.smartman.common.cache.RegionCache;
+import com.qianwen.core.redis.cache.BladeRedis;
+import com.qianwen.core.tool.utils.Func;
 import com.qianwen.smartman.common.constant.CommonConstant;
 import com.qianwen.smartman.common.constant.CommonGroupConstant;
 import com.qianwen.smartman.common.constant.DncConstant;
 import com.qianwen.smartman.common.enums.CommonGroupTypeEnum;
-import com.qianwen.core.redis.cache.BladeRedis;
-import com.qianwen.core.tool.utils.Func;
 import com.qianwen.smartman.modules.cps.entity.CommonGroup;
 import com.qianwen.smartman.modules.cps.entity.CommonGroupOfItem;
 import com.qianwen.smartman.modules.cps.entity.Employee;
@@ -55,9 +54,9 @@
 import com.qianwen.smartman.modules.system.service.IParamService;
 import com.qianwen.smartman.modules.system.service.IPostService;
 import com.qianwen.smartman.modules.system.service.IUserOauthService;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+
+import cn.hutool.core.lang.Snowflake;
+import cn.hutool.core.util.IdUtil;
 
 @Service
 /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/sync/service/impl/DingEventServiceImpl.class */
@@ -74,174 +73,6 @@
     private final PostMapper postMapper;
     private final IParamService paramService;
 
-    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 -1249349403:
-                if (implMethodName.equals("getTel")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case -129715105:
-                if (implMethodName.equals("getEmployeeId")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case -75080655:
-                if (implMethodName.equals("getUuid")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 98245393:
-                if (implMethodName.equals("getId")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 517353092:
-                if (implMethodName.equals("getItemId")) {
-                    z = false;
-                    break;
-                }
-                break;
-            case 713563345:
-                if (implMethodName.equals("getPostId")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 1330288580:
-                if (implMethodName.equals("getGroupId")) {
-                    z = true;
-                    break;
-                }
-                break;
-        }
-        switch (z) {
-            case false:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/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/system/entity/UserOauth") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getUuid();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/UserOauth") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getUuid();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/UserOauth") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getUuid();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/EmployeePost") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getPostId();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/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/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/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/CommonGroupOfItem") && 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/Long;")) {
-                    return (v0) -> {
-                        return v0.getId();
-                    };
-                }
-                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/EmployeePost") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getEmployeeId();
-                    };
-                }
-                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();
-                    };
-                }
-                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.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();
-                    };
-                }
-                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 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.getGroupId();
-                    };
-                }
-                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;
-        }
-        throw new IllegalArgumentException("Invalid lambda deserialization");
-    }
 
     public DingEventServiceImpl(final IUserOauthService userOauthService, final IEmployeeService employeeService, final ICommonGroupService groupService, final CommonGroupMapper commonGroupMapper, final BladeRedis bladeRedis, final IEmployeePostService employeePostService, final ICommonGroupOfItemService commonGroupOfItemService, final IPostService postService, final PostMapper postMapper, final IParamService paramService) {
         this.userOauthService = userOauthService;
@@ -264,6 +95,43 @@
         String eventType = eventJson.getString("EventType");
         String appKey = outerAppConfig.getDingAppKey();
         String appSecret = outerAppConfig.getDingAppSecret();
+        
+        switch (DingEventEnum.getValue(eventType)) {
+        case CHECK_URL:
+          log.info("娴嬭瘯鍥炶皟url鐨勬纭��");
+          break;
+        case USER_ADD_ORG:
+          userAdd(eventJson, appKey, appSecret);
+          break;
+        case USER_MODIFY_ORG:
+          userModify(eventJson, appKey, appSecret);
+          break;
+        case USER_LEAVE_ORG:
+          userLeave(eventJson);
+          break;
+        case ORG_DEPT_CREATE:
+          deptCreate(eventJson, appKey, appSecret);
+          break;
+        case ORG_DEPT_MODIFY:
+          deptModify(eventJson, appKey, appSecret);
+          break;
+        case ORG_DEPT_REMOVE:
+          deptRemove(eventJson);
+          break;
+        case LABEL_USER_CHANGE:
+          labelUserChange(eventJson, appKey, appSecret);
+          break;
+        case LABEL_CONF_ADD:
+          labelAdd(eventJson, appKey, appSecret);
+          break;
+        case LABEL_CONF_DEL:
+          lableDel(eventJson);
+          break;
+        case LABEL_CONF_MODIFY:
+          lableModify(eventJson, appKey, appSecret);
+          break;
+      } 
+        /*
         switch (AnonymousClass1.$SwitchMap$org$springblade$modules$sync$enums$DingEventEnum[DingEventEnum.getValue(eventType).ordinal()]) {
             case 1:
                 log.info("娴嬭瘯鍥炶皟url鐨勬纭��");
@@ -277,7 +145,7 @@
             case 4:
                 userLeave(eventJson);
                 return;
-            case RegionCache.VILLAGE_LEVEL /* 5 */:
+            case RegionCache.VILLAGE_LEVEL // 5 
                 deptCreate(eventJson, appKey, appSecret);
                 return;
             case 6:
@@ -300,62 +168,10 @@
                 return;
             default:
                 return;
-        }
+        }*/
     }
 
-    /* renamed from: org.springblade.modules.sync.service.impl.DingEventServiceImpl$1  reason: invalid class name */
-    /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/sync/service/impl/DingEventServiceImpl$1.class */
-    static /* synthetic */ class AnonymousClass1 {
-        static final /* synthetic */ int[] $SwitchMap$org$springblade$modules$sync$enums$DingEventEnum = new int[DingEventEnum.values().length];
-
-        static {
-            try {
-                $SwitchMap$org$springblade$modules$sync$enums$DingEventEnum[DingEventEnum.CHECK_URL.ordinal()] = 1;
-            } catch (NoSuchFieldError e) {
-            }
-            try {
-                $SwitchMap$org$springblade$modules$sync$enums$DingEventEnum[DingEventEnum.USER_ADD_ORG.ordinal()] = 2;
-            } catch (NoSuchFieldError e2) {
-            }
-            try {
-                $SwitchMap$org$springblade$modules$sync$enums$DingEventEnum[DingEventEnum.USER_MODIFY_ORG.ordinal()] = 3;
-            } catch (NoSuchFieldError e3) {
-            }
-            try {
-                $SwitchMap$org$springblade$modules$sync$enums$DingEventEnum[DingEventEnum.USER_LEAVE_ORG.ordinal()] = 4;
-            } catch (NoSuchFieldError e4) {
-            }
-            try {
-                $SwitchMap$org$springblade$modules$sync$enums$DingEventEnum[DingEventEnum.ORG_DEPT_CREATE.ordinal()] = 5;
-            } catch (NoSuchFieldError e5) {
-            }
-            try {
-                $SwitchMap$org$springblade$modules$sync$enums$DingEventEnum[DingEventEnum.ORG_DEPT_MODIFY.ordinal()] = 6;
-            } catch (NoSuchFieldError e6) {
-            }
-            try {
-                $SwitchMap$org$springblade$modules$sync$enums$DingEventEnum[DingEventEnum.ORG_DEPT_REMOVE.ordinal()] = 7;
-            } catch (NoSuchFieldError e7) {
-            }
-            try {
-                $SwitchMap$org$springblade$modules$sync$enums$DingEventEnum[DingEventEnum.LABEL_USER_CHANGE.ordinal()] = 8;
-            } catch (NoSuchFieldError e8) {
-            }
-            try {
-                $SwitchMap$org$springblade$modules$sync$enums$DingEventEnum[DingEventEnum.LABEL_CONF_ADD.ordinal()] = 9;
-            } catch (NoSuchFieldError e9) {
-            }
-            try {
-                $SwitchMap$org$springblade$modules$sync$enums$DingEventEnum[DingEventEnum.LABEL_CONF_DEL.ordinal()] = 10;
-            } catch (NoSuchFieldError e10) {
-            }
-            try {
-                $SwitchMap$org$springblade$modules$sync$enums$DingEventEnum[DingEventEnum.LABEL_CONF_MODIFY.ordinal()] = 11;
-            } catch (NoSuchFieldError e11) {
-            }
-        }
-    }
-
+    
     @Override // org.springblade.modules.sync.service.IDingEventService
     public void addNewEmployee(JSONObject userObject, UserOauth userOauth, Snowflake snowflake) {
         Employee newEmployee = new Employee();
@@ -411,9 +227,11 @@
                     newAuth.setUsername(userObject.getString("name"));
                     newAuth.setAvatar(userObject.getString("avatar"));
                     newAuth.setSource(DingConstant.DING_AUTH_KEY);
+                    Employee employee = this.employeeService.getOne(Wrappers.<Employee>lambdaQuery().eq(Employee::getTel, userObject.getString("mobile")), false);
+                    /*
                     Employee employee = (Employee) this.employeeService.getOne((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
                         return v0.getTel();
-                    }, userObject.getString("mobile")), false);
+                    }, userObject.getString("mobile")), false);*/
                     if (Func.isNotEmpty(employee)) {
                         updateEmployee(userObject, employee);
                         newAuth.setUserId(employee.getId());
@@ -439,12 +257,16 @@
                 JSONObject jsonObject = JSONObject.parseObject(rsp.getBody());
                 if (jsonObject.getInteger(QyWechatConstant.ERROR_CODE_KEY).equals(DingConstant.SUCCESS)) {
                     JSONObject userObject = jsonObject.getJSONObject("result");
+                    UserOauth userOauth = this.userOauthService.getOne(Wrappers.<UserOauth>lambdaQuery().eq(UserOauth::getUuid, id), false);
+                    /*
                     UserOauth userOauth = (UserOauth) this.userOauthService.getOne((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
                         return v0.getUuid();
-                    }, id), false);
+                    }, id), false);*/
+                    Employee employee = this.employeeService.getOne(Wrappers.<Employee>lambdaQuery().eq(Employee::getTel, userObject.getString("mobile")), false);
+                    /*
                     Employee employee = (Employee) this.employeeService.getOne((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
                         return v0.getTel();
-                    }, userObject.getString("mobile")), false);
+                    }, userObject.getString("mobile")), false);*/
                     userOauth.setUsername(userObject.getString("name"));
                     userOauth.setAvatar(userObject.getString("avatar"));
                     this.userOauthService.updateById(userOauth);
@@ -490,16 +312,21 @@
                 employeePost.setPostId(role.getId());
                 employeePosts.add(employeePost);
             }
+            this.employeePostService.remove(Wrappers.<EmployeePost>lambdaQuery().eq(EmployeePost::getEmployeeId, employee.getId()));
+            /*
             this.employeePostService.remove((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
                 return v0.getEmployeeId();
-            }, employee.getId()));
+            }, employee.getId()));*/
             this.employeePostService.saveBatch(employeePosts);
         }
+        this.commonGroupOfItemService.remove(Wrappers.<CommonGroupOfItem>lambdaQuery().eq(CommonGroupOfItem::getItemId, employee.getId())
+        		.eq(CommonGroupOfItem::getGroupType, CommonGroupTypeEnum.ORGANIZATION.getName()));
+        /*
         this.commonGroupOfItemService.remove((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
             return v0.getItemId();
         }, employee.getId())).eq((v0) -> {
             return v0.getGroupType();
-        }, CommonGroupTypeEnum.ORGANIZATION.getName()));
+        }, CommonGroupTypeEnum.ORGANIZATION.getName()));*/
         this.commonGroupOfItemService.save(CommonGroupOfItem.builder().groupId(Long.valueOf(employee.getOrganizationId())).itemId(employee.getId()).groupType(CommonGroupTypeEnum.ORGANIZATION.getName()).groupCategory(CommonGroupConstant.DEFAULT_CATEGORY).build());
         this.employeeService.updateById(employee);
     }
@@ -507,26 +334,40 @@
     private void userLeave(JSONObject eventJson) {
         try {
             List<String> userIdList = eventJson.getJSONArray("UserId").toJavaList(String.class);
+            List<UserOauth> userOauths = this.userOauthService.list(Wrappers.<UserOauth>lambdaQuery().in(UserOauth::getUuid, userIdList));
+            /*
             List<UserOauth> userOauths = this.userOauthService.list((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
                 return v0.getUuid();
-            }, userIdList));
-            List<Long> empIds = (List) userOauths.stream().map((v0) -> {
+            }, userIdList));*/
+            List<Long> empIds = userOauths.stream().map((v0) -> {
                 return v0.getUserId();
             }).collect(Collectors.toList());
-            this.userOauthService.remove((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
+            
+            this.userOauthService.remove(Wrappers.<UserOauth>lambdaQuery().in(UserOauth::getUuid, userIdList));
+            /*
+            this.userOauthService.remove(Wrappers.lambdaQuery().in((v0) -> {
                 return v0.getUuid();
-            }, userIdList));
+            }, userIdList));*/
+            this.employeeService.remove(Wrappers.<Employee>lambdaQuery().in(Employee::getId, empIds));
+            /*
             this.employeeService.remove((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
                 return v0.getId();
-            }, empIds));
+            }, empIds));*/
+            this.employeePostService.remove(Wrappers.<EmployeePost>lambdaQuery().in(EmployeePost::getEmployeeId, empIds));
+            /*
             this.employeePostService.remove((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
                 return v0.getEmployeeId();
-            }, empIds));
+            }, empIds));*/
+            
+            this.commonGroupOfItemService.remove(Wrappers.<CommonGroupOfItem>lambdaQuery()
+            		.in(CommonGroupOfItem::getItemId, empIds)
+            		.eq(CommonGroupOfItem::getGroupType, CommonGroupTypeEnum.ORGANIZATION.getName()));
+            /*
             this.commonGroupOfItemService.remove((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().in((v0) -> {
                 return v0.getItemId();
             }, empIds)).eq((v0) -> {
                 return v0.getGroupType();
-            }, CommonGroupTypeEnum.ORGANIZATION.getName()));
+            }, CommonGroupTypeEnum.ORGANIZATION.getName()));*/
         } catch (Exception e) {
             log.error("閫氳褰曠敤鎴风鑱岋紝寮傚父淇℃伅涓�:", e);
         }
@@ -562,11 +403,13 @@
         try {
             List<String> deptIds = eventJson.getJSONArray("DeptId").toJavaList(String.class);
             this.commonGroupMapper.removeOrgByIds(deptIds);
+            this.commonGroupOfItemService.remove(Wrappers.<CommonGroupOfItem>lambdaQuery().in(CommonGroupOfItem::getGroupId, deptIds).eq(CommonGroupOfItem::getGroupType, CommonGroupTypeEnum.ORGANIZATION.getName()));
+            /*
             this.commonGroupOfItemService.remove((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().in((v0) -> {
                 return v0.getGroupId();
             }, deptIds)).eq((v0) -> {
                 return v0.getGroupType();
-            }, CommonGroupTypeEnum.ORGANIZATION.getName()));
+            }, CommonGroupTypeEnum.ORGANIZATION.getName()));*/
             for (String deptId : deptIds) {
                 DefaultDingTalkClient defaultDingTalkClient = new DefaultDingTalkClient("https://oapi.dingtalk.com/topapi/v2/department/get");
                 OapiV2DepartmentGetRequest req = new OapiV2DepartmentGetRequest();
@@ -588,11 +431,14 @@
         try {
             List<String> deptIds = eventJson.getJSONArray("DeptId").toJavaList(String.class);
             this.commonGroupMapper.removeOrgByIds(deptIds);
+            this.commonGroupOfItemService.remove(Wrappers.<CommonGroupOfItem>lambdaQuery().in(CommonGroupOfItem::getGroupId, deptIds)
+            		.eq(CommonGroupOfItem::getGroupType, CommonGroupTypeEnum.ORGANIZATION.getName()));
+            /*
             this.commonGroupOfItemService.remove((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().in((v0) -> {
                 return v0.getGroupId();
             }, deptIds)).eq((v0) -> {
                 return v0.getGroupType();
-            }, CommonGroupTypeEnum.ORGANIZATION.getName()));
+            }, CommonGroupTypeEnum.ORGANIZATION.getName()));*/
         } catch (Exception e) {
             log.error("閫氳褰曠敤鎴风鑱岋紝寮傚父淇℃伅涓�:", e);
         }
@@ -611,9 +457,11 @@
                 JSONObject jsonObject = JSONObject.parseObject(rsp.getBody());
                 if (jsonObject.getInteger(QyWechatConstant.ERROR_CODE_KEY).equals(DingConstant.SUCCESS)) {
                     JSONObject userObject = jsonObject.getJSONObject("result");
+                    Employee employee = (Employee)this.employeeService.getOne(Wrappers.<Employee>lambdaQuery().eq(Employee::getTel, userObject.getString("mobile")), false);
+                    /*
                     Employee employee = (Employee) this.employeeService.getOne((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
                         return v0.getTel();
-                    }, userObject.getString("mobile")), false);
+                    }, userObject.getString("mobile")), false);*/
                     JSONArray roleList = userObject.getJSONArray("role_list");
                     if (Func.isNotEmpty(roleList)) {
                         List<DingUserInnerRole> innerRoles = roleList.toJavaList(DingUserInnerRole.class);
@@ -631,9 +479,11 @@
                     }
                 }
             }
+            this.employeePostService.remove(Wrappers.<EmployeePost>lambdaQuery().in(EmployeePost::getEmployeeId, userIdList));
+            /*
             this.employeePostService.remove((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
                 return v0.getEmployeeId();
-            }, userIdList));
+            }, userIdList));*/
             if (Func.isNotEmpty(employeesUpdate)) {
                 this.employeeService.updateBatchById(employeesUpdate);
             }
@@ -694,9 +544,11 @@
         try {
             List<String> roleIds = eventJson.getJSONArray("LabelIdList").toJavaList(String.class);
             this.postMapper.removePostByIds(roleIds);
+            this.employeePostService.remove(Wrappers.<EmployeePost>lambdaQuery().in(EmployeePost::getPostId, roleIds));
+            /*
             this.employeePostService.remove((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
                 return v0.getPostId();
-            }, roleIds));
+            }, roleIds));*/
         } catch (Exception e) {
             log.error("鍒犻櫎瑙掕壊鎴栬�呰鑹茬粍锛屽紓甯镐俊鎭负:", e);
         }
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/sync/service/impl/DingSyncServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/sync/service/impl/DingSyncServiceImpl.java
index 9fe1ce5..4669c8d 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/sync/service/impl/DingSyncServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/sync/service/impl/DingSyncServiceImpl.java
@@ -1,7 +1,22 @@
 package com.qianwen.smartman.modules.sync.service.impl;
 
-import cn.hutool.core.lang.Snowflake;
-import cn.hutool.core.util.IdUtil;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.DefaultTransactionDefinition;
+
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.aliyun.dingtalkcontact_1_0.models.GetUserHeaders;
@@ -9,45 +24,33 @@
 import com.aliyun.dingtalkoauth2_1_0.Client;
 import com.aliyun.teaopenapi.models.Config;
 import com.aliyun.teautil.models.RuntimeOptions;
-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.toolkit.Wrappers;
 import com.dingtalk.api.DefaultDingTalkClient;
 import com.dingtalk.api.request.OapiAuthScopesRequest;
+import com.dingtalk.api.request.OapiRoleListRequest;
 import com.dingtalk.api.request.OapiRoleSimplelistRequest;
 import com.dingtalk.api.request.OapiSnsGetuserinfoBycodeRequest;
 import com.dingtalk.api.request.OapiUserGetbyunionidRequest;
 import com.dingtalk.api.request.OapiV2DepartmentGetRequest;
 import com.dingtalk.api.request.OapiV2DepartmentListsubRequest;
 import com.dingtalk.api.request.OapiV2UserGetRequest;
+import com.dingtalk.api.request.OapiV2UserListRequest;
 import com.dingtalk.api.response.OapiAuthScopesResponse;
+import com.dingtalk.api.response.OapiRoleListResponse;
 import com.dingtalk.api.response.OapiRoleSimplelistResponse;
 import com.dingtalk.api.response.OapiSnsGetuserinfoBycodeResponse;
 import com.dingtalk.api.response.OapiUserGetbyunionidResponse;
 import com.dingtalk.api.response.OapiV2DepartmentGetResponse;
 import com.dingtalk.api.response.OapiV2DepartmentListsubResponse;
 import com.dingtalk.api.response.OapiV2UserGetResponse;
-import java.lang.invoke.SerializedLambda;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-import org.jetbrains.annotations.NotNull;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.qianwen.smartman.common.cache.RegionCache;
+import com.dingtalk.api.response.OapiV2UserListResponse;
+import com.qianwen.core.log.exception.ServiceException;
+import com.qianwen.core.tool.utils.Func;
+import com.qianwen.core.tool.utils.StringUtil;
 import com.qianwen.smartman.common.constant.CommonConstant;
 import com.qianwen.smartman.common.constant.CommonGroupConstant;
 import com.qianwen.smartman.common.enums.CommonGroupTypeEnum;
 import com.qianwen.smartman.common.utils.MessageUtils;
-import com.qianwen.core.log.exception.ServiceException;
-import com.qianwen.core.tool.utils.Func;
-import com.qianwen.core.tool.utils.StringUtil;
 import com.qianwen.smartman.modules.cps.entity.CommonGroup;
 import com.qianwen.smartman.modules.cps.entity.CommonGroupOfItem;
 import com.qianwen.smartman.modules.cps.entity.Employee;
@@ -73,11 +76,10 @@
 import com.qianwen.smartman.modules.system.service.IParamService;
 import com.qianwen.smartman.modules.system.service.IPostService;
 import com.qianwen.smartman.modules.system.service.IUserOauthService;
-import org.springframework.jdbc.datasource.DataSourceTransactionManager;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.TransactionStatus;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.support.DefaultTransactionDefinition;
+import com.taobao.api.TaobaoRequest;
+
+import cn.hutool.core.lang.Snowflake;
+import cn.hutool.core.util.IdUtil;
 
 @Service
 /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/sync/service/impl/DingSyncServiceImpl.class */
@@ -97,108 +99,6 @@
     private final IParamService paramService;
     private final IEmployeePostService employeePostService;
 
-    private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
-        String implMethodName = lambda.getImplMethodName();
-        boolean z = true;
-        switch (implMethodName.hashCode()) {
-            case -75080655:
-                if (implMethodName.equals("getUuid")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 98245393:
-                if (implMethodName.equals("getId")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 242925765:
-                if (implMethodName.equals("getAppType")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 799509265:
-                if (implMethodName.equals("getSource")) {
-                    z = false;
-                    break;
-                }
-                break;
-            case 859984188:
-                if (implMethodName.equals("getUserId")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 1722789684:
-                if (implMethodName.equals("getLastSyncTime")) {
-                    z = true;
-                    break;
-                }
-                break;
-        }
-        switch (z) {
-            case false:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/UserOauth") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getSource();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/UserOauth") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getSource();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/UserOauth") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getUuid();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/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/sync/entity/OuterAppConfig") && lambda.getImplMethodSignature().equals("()Ljava/util/Date;")) {
-                    return (v0) -> {
-                        return v0.getLastSyncTime();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/UserOauth") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getUserId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/UserOauth") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getUserId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/UserOauth") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getUserId();
-                    };
-                }
-                break;
-            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/sync/entity/OuterAppConfig") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getAppType();
-                    };
-                }
-                break;
-        }
-        throw new IllegalArgumentException("Invalid lambda deserialization");
-    }
 
     public DingSyncServiceImpl(final IUserOauthService userOauthService, final IEmployeeService employeeService, final IPostService postService, final ICommonGroupService groupService, final CommonGroupMapper commonGroupMapper, final IDingEventService dingEventService, final ICommonGroupOfItemService commonGroupOfItemService, final Map<String, Set<String>> userPostRelationMap, final DataSourceTransactionManager dataSourceTransactionManager, final PostMapper postMapper, final IOuterAppConfigService outerAppConfigService, final IParamService paramService, final IEmployeePostService employeePostService) {
         this.userOauthService = userOauthService;
@@ -218,36 +118,33 @@
 
     @Override // org.springblade.modules.sync.service.IDingSyncService
     public SyncResultVO syncImmediately() {
-        List<Post> posts;
-        List<DingOriDept> oriGroups;
-        List<DingOriUser> oriUsers;
-        List<Long> permissionGroups;
-        OuterAppConfig dingAppConfig = this.outerAppConfigService.getAppConfig(OuterAppConfigConstant.DING);
+    	
+    	OuterAppConfig dingAppConfig = this.outerAppConfigService.getAppConfig(OuterAppConfigConstant.DING);
         String appKey = dingAppConfig.getDingAppKey();
         String appSecret = dingAppConfig.getDingAppSecret();
         DefaultTransactionDefinition transDefinition = new DefaultTransactionDefinition();
+        
+    	List<Post> posts = new ArrayList<>();
+        List<DingOriDept> oriGroups = new ArrayList<>();
+        List<DingOriUser> oriUsers = new ArrayList<>();
+        
+        
+        
         TransactionStatus transStatus = this.dataSourceTransactionManager.getTransaction(transDefinition);
         SyncResultVO syncResultVO = new SyncResultVO();
         try {
-            try {
-                posts = new ArrayList<>();
-                oriGroups = new ArrayList<>();
-                oriUsers = new ArrayList<>();
-                getRoles(appKey, appSecret, posts, syncResultVO);
-                permissionGroups = getPermissionGroup(appKey, appSecret, syncResultVO);
-                if (Func.isEmpty(permissionGroups)) {
-                    syncResultVO.setGroupResult(false);
-                    syncResultVO.setUserReason("鏈幏鍙栧埌鏉冮檺鑼冨洿鍐呯殑缁勭粐鏈烘瀯锛�");
-                }
-                for (Long permissionGroup : permissionGroups) {
-                    SyncEmployee(permissionGroup, appKey, appSecret, oriUsers, syncResultVO);
-                    recursionGetGroup(permissionGroup, appKey, appSecret, oriGroups, oriUsers, syncResultVO, permissionGroups);
-                }
-            } catch (Exception e) {
-                log.error("鍚屾閽夐拤閫氳褰曞紓甯革紝寮傚父淇℃伅涓猴細", e);
-                this.dataSourceTransactionManager.rollback(transStatus);
-                this.userPostRelationMap.clear();
+            getRoles(appKey, appSecret, posts, syncResultVO);
+            
+            List<Long> permissionGroups = getPermissionGroup(appKey, appSecret, syncResultVO);
+            if (Func.isEmpty(permissionGroups)) {
+                syncResultVO.setGroupResult(false);
+                syncResultVO.setUserReason("鏈幏鍙栧埌鏉冮檺鑼冨洿鍐呯殑缁勭粐鏈烘瀯锛�");
             }
+            for (Long permissionGroup : permissionGroups) {
+                SyncEmployee(permissionGroup, appKey, appSecret, oriUsers, syncResultVO);
+                recursionGetGroup(permissionGroup, appKey, appSecret, oriGroups, oriUsers, syncResultVO, permissionGroups);
+            }
+           
             if (!syncResultVO.getGroupResult().booleanValue() || !syncResultVO.getPostResult().booleanValue() || !syncResultVO.getUserResult().booleanValue()) {
                 this.userPostRelationMap.clear();
                 return syncResultVO;
@@ -279,11 +176,13 @@
                 this.commonGroupMapper.removeOrgContact();
                 this.employeePostService.remove(Wrappers.lambdaQuery());
                 handleAuthAndEmployee(oriUsers, employees, userOauths, commonGroupOfItems, employeePosts, updateEmployees);
+                this.employeeService.remove(Wrappers.<Employee>lambdaQuery().notIn(Func.isNotEmpty(updateEmployees), Employee::getId, updateEmployees.stream().map(Employee::getId).collect(Collectors.toList())));
+                /*
                 this.employeeService.remove(Wrappers.lambdaQuery().notIn(Func.isNotEmpty(updateEmployees), (v0) -> {
                     return v0.getId();
                 }, (Collection) updateEmployees.stream().map((v0) -> {
                     return v0.getId();
-                }).collect(Collectors.toList())));
+                }).collect(Collectors.toList())));*/
                 this.employeeService.saveBatch(employees);
                 this.employeeService.updateBatchById(updateEmployees);
                 this.userOauthService.saveOrUpdateBatch(userOauths);
@@ -297,11 +196,14 @@
                 syncResultVO.setUserReason("鍚屾閽夐拤鍛樺伐鏁版嵁搴撻儴鍒嗘姤閿�:" + e4.toString());
             }
             if (syncResultVO.getGroupResult().booleanValue() && syncResultVO.getPostResult().booleanValue() && syncResultVO.getUserResult().booleanValue()) {
+            	this.outerAppConfigService.update(Wrappers.<OuterAppConfig>lambdaUpdate().eq(OuterAppConfig::getAppType, OuterAppConfigConstant.DING)
+            			.set(OuterAppConfig::getLastSyncTime, new Date())); 
+            	/*
                 this.outerAppConfigService.update((Wrapper) ((LambdaUpdateWrapper) Wrappers.lambdaUpdate().eq((v0) -> {
                     return v0.getAppType();
                 }, OuterAppConfigConstant.DING)).set((v0) -> {
                     return v0.getLastSyncTime();
-                }, new Date()));
+                }, new Date()));*/
             }
             if (flag.booleanValue()) {
                 this.dataSourceTransactionManager.commit(transStatus);
@@ -310,10 +212,16 @@
             }
             this.userPostRelationMap.clear();
             return syncResultVO;
-        } catch (Throwable th) {
-            this.userPostRelationMap.clear();
-            throw th;
+        } catch (Exception th) {
+        	log.error("鍚屾閽夐拤閫氳褰曞紓甯革紝寮傚父淇℃伅涓猴細", th);
+        	this.dataSourceTransactionManager.rollback(transStatus);
+            
+            //throw th;
+        }finally {
+        	this.userPostRelationMap.clear();
         }
+        
+        return syncResultVO;
     }
 
     private List<Long> getPermissionGroup(String appKey, String appSecret, SyncResultVO syncResultVO) {
@@ -351,9 +259,11 @@
                 userObject = getDetailByUserId(userId, appKey, appSecret);
             }
             if (Func.isNotEmpty(userId) && Func.isNotEmpty(userObject)) {
+            	UserOauth userOauth = this.userOauthService.getOne(Wrappers.<UserOauth>lambdaQuery().eq(UserOauth::getUuid, userId), false);
+            	/*
                 UserOauth userOauth = (UserOauth) this.userOauthService.getOne((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
                     return v0.getUuid();
-                }, userId), false);
+                }, userId), false);*/
                 if (Func.isEmpty(userOauth)) {
                     throw new ServiceException(MessageUtils.message("sys.outer.user.not.exist", new Object[0]));
                 }
@@ -373,21 +283,27 @@
 
     @Override // org.springblade.modules.sync.service.IDingSyncService
     public Boolean unbind(Long id, String source) {
+    	UserOauth userOauth = this.userOauthService.getOne(Wrappers.<UserOauth>lambdaQuery().eq(UserOauth::getUserId, id).eq(UserOauth::getSource, source));
+    	/*
         UserOauth userOauth = (UserOauth) this.userOauthService.getOne((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
             return v0.getUserId();
         }, id)).eq((v0) -> {
             return v0.getSource();
-        }, source));
+        }, source));*/
         if (Func.isEmpty(userOauth)) {
             throw new ServiceException(MessageUtils.message("cps.employee.not.band", new Object[0]));
         }
+        
+        return Boolean.valueOf(this.userOauthService.update(Wrappers.<UserOauth>lambdaUpdate()
+        		.set(UserOauth::getUserId, null).eq(UserOauth::getUserId, id).eq(UserOauth::getSource, source)));
+        /*
         return Boolean.valueOf(this.userOauthService.update((Wrapper) ((LambdaUpdateWrapper) ((LambdaUpdateWrapper) Wrappers.lambdaUpdate().set((v0) -> {
             return v0.getUserId();
         }, (Object) null)).eq((v0) -> {
             return v0.getUserId();
         }, id)).eq((v0) -> {
             return v0.getSource();
-        }, source)));
+        }, source)));*/
     }
 
     @Override // org.springblade.modules.sync.service.IDingSyncService
@@ -467,13 +383,15 @@
         if (Func.isNotEmpty(oriUsers)) {
             String pinValue = this.paramService.getValue("employee.default.pin");
             List<Employee> dbEmployees = this.employeeService.list();
-            Map<String, Employee> employeeMap = (Map) dbEmployees.parallelStream().filter(o -> {
+            
+            
+            Map<String, Employee> employeeMap = dbEmployees.parallelStream().filter(o -> {
                 return Func.isNotEmpty(o.getTel());
             }).collect(Collectors.toMap((v0) -> {
                 return v0.getTel();
             }, e -> {
                 return e;
-            }, k1, k2 -> {
+            }, (k1, k2) -> {
                 return k1;
             }));
             Snowflake snowflake = IdUtil.createSnowflake(1L, 1L);
@@ -580,21 +498,47 @@
         }
     }
 
-    /* JADX WARN: Code restructure failed: missing block: B:20:0x0161, code lost:
-        r10.setPostResult(false);
-        r10.setPostReason("鍚屾閽夐拤瑙掕壊寮傚父锛岀粨鏋滀负锛�" + r0 + "---------鍙傛暟涓猴細" + r0);
-     */
-    /*
-        Code decompiled incorrectly, please refer to instructions dump.
-        To view partially-correct code enable 'Show inconsistent code' option in preferences
-    */
-    private void getRoles(java.lang.String r7, java.lang.String r8, java.util.List<org.springblade.modules.system.entity.Post> r9, org.springblade.modules.sync.vo.SyncResultVO r10) {
-        /*
-            Method dump skipped, instructions count: 448
-            To view this dump change 'Code comments level' option to 'DEBUG'
-        */
-        throw new UnsupportedOperationException("Method not decompiled: org.springblade.modules.sync.service.impl.DingSyncServiceImpl.getRoles(java.lang.String, java.lang.String, java.util.List, org.springblade.modules.sync.vo.SyncResultVO):void");
-    }
+    private void getRoles(String appKey, String appSecret, List<Post> postList, SyncResultVO syncResultVO) {
+        try {
+          DefaultDingTalkClient defaultDingTalkClient = new DefaultDingTalkClient("https://oapi.dingtalk.com/topapi/role/list");
+          OapiRoleListRequest req = new OapiRoleListRequest();
+          req.setSize(DingConstant.ROLE_SIZE);
+          req.setOffset(DingConstant.START_OFFSET);
+          while (true) {
+            OapiRoleListResponse rsp = (OapiRoleListResponse)defaultDingTalkClient.execute((TaobaoRequest)req, this.dingEventService.getDingAccessToken(appKey, appSecret));
+            JSONObject jsonObject = JSONObject.parseObject(rsp.getBody());
+            if (jsonObject.getInteger("errcode").equals(DingConstant.SUCCESS)) {
+              Map<String, Object> resultMap = (Map<String, Object>)jsonObject.get("result");
+              List<Map<String, Object>> resultList = (List<Map<String, Object>>)resultMap.get("list");
+              if (Func.isNotEmpty(resultList))
+                for (Map<String, Object> roleGroupMap : resultList) {
+                  List<Map<String, Object>> roleList = (List<Map<String, Object>>)roleGroupMap.get("roles");
+                  if (Func.isNotEmpty(roleList))
+                    for (Map<String, Object> role : roleList) {
+                      Post post = new Post();
+                      post.setPostCode(String.valueOf(role.get("id")));
+                      post.setId(Long.valueOf(String.valueOf(role.get("id"))));
+                      post.setPostName(String.valueOf(role.get("name")));
+                      post.setStatus(CommonConstant.ENABLE);
+                      postList.add(post);
+                      getRoleContainsUser(post.getPostCode(), appKey, appSecret);
+                    }  
+                }  
+              if (((Boolean)resultMap.get("hasMore")).booleanValue()) {
+                req.setOffset(Long.valueOf(req.getOffset().longValue() + DingConstant.ROLE_SIZE.longValue()));
+                continue;
+              } 
+              break;
+            } 
+            syncResultVO.setPostResult(Boolean.valueOf(false));
+            syncResultVO.setPostReason("鍚屾閽夐拤瑙掕壊寮傚父锛岀粨鏋滀负锛�" + jsonObject + "---------鍙傛暟涓猴細" + req);
+            break;
+          } 
+        } catch (Exception e) {
+          syncResultVO.setPostResult(Boolean.valueOf(false));
+          syncResultVO.setPostReason("鍚屾閽夐拤瑙掕壊鎶ラ敊:" + e.toString());
+        } 
+      }
 
     private void getRoleContainsUser(String postCode, String appKey, String appSecret) throws Exception {
         DefaultDingTalkClient defaultDingTalkClient = new DefaultDingTalkClient("https://oapi.dingtalk.com/topapi/role/simplelist");
@@ -666,21 +610,36 @@
         }
     }
 
-    /* JADX WARN: Code restructure failed: missing block: B:15:0x00cb, code lost:
-        r11.setUserResult(false);
-        r11.setUserReason("鍚屾閽夐拤鐢ㄦ埛寮傚父锛岀粨鏋滀负锛�" + r0 + "---------鍙傛暟涓猴細" + r0);
-     */
-    /*
-        Code decompiled incorrectly, please refer to instructions dump.
-        To view partially-correct code enable 'Show inconsistent code' option in preferences
-    */
-    private void SyncEmployee(java.lang.Long r7, java.lang.String r8, java.lang.String r9, java.util.List<org.springblade.modules.sync.entity.DingOriUser> r10, org.springblade.modules.sync.vo.SyncResultVO r11) {
-        /*
-            Method dump skipped, instructions count: 298
-            To view this dump change 'Code comments level' option to 'DEBUG'
-        */
-        throw new UnsupportedOperationException("Method not decompiled: org.springblade.modules.sync.service.impl.DingSyncServiceImpl.SyncEmployee(java.lang.Long, java.lang.String, java.lang.String, java.util.List, org.springblade.modules.sync.vo.SyncResultVO):void");
-    }
+    private void SyncEmployee(Long deptId, String appKey, String appSecret, List<DingOriUser> oriUsers, SyncResultVO syncResultVO) {
+        try {
+          DefaultDingTalkClient defaultDingTalkClient = new DefaultDingTalkClient("https://oapi.dingtalk.com/topapi/v2/user/list");
+          OapiV2UserListRequest req = new OapiV2UserListRequest();
+          req.setSize(DingConstant.SIZE);
+          req.setDeptId(Long.valueOf(deptId.equals(Long.valueOf(3L)) ? 1L : deptId.longValue()));
+          req.setCursor(DingConstant.START_OFFSET);
+          while (true) {
+            OapiV2UserListResponse rsp = (OapiV2UserListResponse)defaultDingTalkClient.execute((TaobaoRequest)req, this.dingEventService.getDingAccessToken(appKey, appSecret));
+            JSONObject jsonObject = JSONObject.parseObject(rsp.getBody());
+            if (jsonObject.getInteger("errcode").equals(DingConstant.SUCCESS)) {
+              JSONObject resultMap = jsonObject.getJSONObject("result");
+              List<DingOriUser> resultList = resultMap.getJSONArray("list").toJavaList(DingOriUser.class);
+              if (Func.isNotEmpty(resultList))
+                resultList.forEach(userMap -> oriUsers.add(userMap)); 
+              if (((Boolean)resultMap.get("has_more")).booleanValue()) {
+                req.setCursor(Long.valueOf(String.valueOf(resultMap.get("next_cursor"))));
+                continue;
+              } 
+              break;
+            } 
+            syncResultVO.setUserResult(Boolean.valueOf(false));
+            syncResultVO.setUserReason("鍚屾閽夐拤鐢ㄦ埛寮傚父锛岀粨鏋滀负锛�" + jsonObject + "---------鍙傛暟涓猴細" + req);
+            break;
+          } 
+        } catch (Exception e) {
+          syncResultVO.setUserResult(Boolean.valueOf(false));
+          syncResultVO.setUserReason("鍚屾閽夐拤鐢ㄦ埛鎶ラ敊:" + e.toString());
+        } 
+      }
 
     public static Client authClient() throws Exception {
         Config config = new Config();
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/sync/service/impl/OuterAppConfigServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/sync/service/impl/OuterAppConfigServiceImpl.java
index 67b21ca..4886e54 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/sync/service/impl/OuterAppConfigServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/sync/service/impl/OuterAppConfigServiceImpl.java
@@ -1,21 +1,23 @@
 package com.qianwen.smartman.modules.sync.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import java.lang.invoke.SerializedLambda;
 import java.time.Duration;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
-import com.qianwen.smartman.common.constant.CommonConstant;
-import com.qianwen.smartman.common.utils.MessageUtils;
+
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.qianwen.core.log.exception.ServiceException;
 import com.qianwen.core.mp.base.BaseServiceImpl;
 import com.qianwen.core.mp.support.Condition;
 import com.qianwen.core.redis.cache.BladeRedis;
 import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.constant.CommonConstant;
+import com.qianwen.smartman.common.utils.MessageUtils;
 import com.qianwen.smartman.modules.notify.service.INotifyConfigService;
 import com.qianwen.smartman.modules.sync.constant.DingConstant;
 import com.qianwen.smartman.modules.sync.constant.OuterAppConfigConstant;
@@ -25,10 +27,8 @@
 import com.qianwen.smartman.modules.sync.mapper.OuterAppConfigMapper;
 import com.qianwen.smartman.modules.sync.service.IOuterAppConfigService;
 import com.qianwen.smartman.modules.sync.vo.OuterAppConfigVO;
+import com.qianwen.smartman.modules.system.entity.UserOauth;
 import com.qianwen.smartman.modules.system.service.IUserOauthService;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 @Service
 /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/sync/service/impl/OuterAppConfigServiceImpl.class */
@@ -37,77 +37,6 @@
     private final IUserOauthService userOauthService;
     private final INotifyConfigService notifyConfigService;
 
-    private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
-        String implMethodName = lambda.getImplMethodName();
-        boolean z = true;
-        switch (implMethodName.hashCode()) {
-            case 242925765:
-                if (implMethodName.equals("getAppType")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 799509265:
-                if (implMethodName.equals("getSource")) {
-                    z = false;
-                    break;
-                }
-                break;
-            case 803533544:
-                if (implMethodName.equals("getStatus")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 859984188:
-                if (implMethodName.equals("getUserId")) {
-                    z = true;
-                    break;
-                }
-                break;
-        }
-        switch (z) {
-            case false:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/UserOauth") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getSource();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/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/system/entity/UserOauth") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getUserId();
-                    };
-                }
-                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/sync/entity/OuterAppConfig") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getAppType();
-                    };
-                }
-                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/sync/entity/OuterAppConfig") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getAppType();
-                    };
-                }
-                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/sync/entity/OuterAppConfig") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getAppType();
-                    };
-                }
-                break;
-        }
-        throw new IllegalArgumentException("Invalid lambda deserialization");
-    }
 
     public OuterAppConfigServiceImpl(BladeRedis bladeRedis, IUserOauthService userOauthService, @Lazy INotifyConfigService notifyConfigService) {
         this.bladeRedis = bladeRedis;
@@ -121,9 +50,12 @@
         if (Func.isNotEmpty(configObj)) {
             return (OuterAppConfig) Func.convert(configObj, OuterAppConfig.class);
         }
+        
+        OuterAppConfig dingAppConfig = getOne(Wrappers.<OuterAppConfig>lambdaQuery().eq(OuterAppConfig::getAppType, appType));
+        /*
         OuterAppConfig dingAppConfig = (OuterAppConfig) getOne((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
             return v0.getAppType();
-        }, appType));
+        }, appType));*/
         this.bladeRedis.setEx(OuterAppConfigConstant.OUTER_APP_CONFIG + appType, dingAppConfig, Duration.ofDays(7L));
         return dingAppConfig;
     }
@@ -132,23 +64,30 @@
     @Transactional
     public Boolean unbind(Integer type) {
         this.bladeRedis.del(OuterAppConfigConstant.OUTER_APP_CONFIG + type);
+        this.userOauthService.update(Wrappers.<UserOauth>lambdaUpdate()
+        		.eq(UserOauth::getSource, type.equals(OuterAppConfigConstant.QY_WECHAT) ? "WECHAT_ENTERPRISE_WEB" : "DINGTALK_WEB").set(UserOauth::getUserId, null));
+        /*
         this.userOauthService.update((Wrapper) ((LambdaUpdateWrapper) Wrappers.lambdaUpdate().eq((v0) -> {
             return v0.getSource();
         }, type.equals(OuterAppConfigConstant.QY_WECHAT) ? QyWechatConstant.QY_SOURCE : DingConstant.DING_AUTH_KEY)).set((v0) -> {
             return v0.getUserId();
-        }, (Object) null));
+        }, (Object) null));*/
+        return Boolean.valueOf(update(Wrappers.<OuterAppConfig>lambdaUpdate().eq(OuterAppConfig::getAppType, type).set(OuterAppConfig::getStatus, CommonConstant.DEACTIVATE)));
+        /*
         return Boolean.valueOf(update((Wrapper) ((LambdaUpdateWrapper) Wrappers.lambdaUpdate().eq((v0) -> {
             return v0.getAppType();
         }, type)).set((v0) -> {
             return v0.getStatus();
-        }, CommonConstant.DEACTIVATE)));
+        }, CommonConstant.DEACTIVATE)));*/
     }
 
     @Override // org.springblade.modules.sync.service.IOuterAppConfigService
     public OuterAppConfigVO submit(OuterAppConfigVO outerAppConfigVO) {
+    	OuterAppConfig dingAppConfig = getOne(Wrappers.<OuterAppConfig>lambdaQuery().eq(OuterAppConfig::getAppType, outerAppConfigVO.getAppType().equals(OuterAppConfigConstant.QY_WECHAT) ? OuterAppConfigConstant.DING : OuterAppConfigConstant.QY_WECHAT));
+    	/*
         OuterAppConfig dingAppConfig = (OuterAppConfig) getOne((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
             return v0.getAppType();
-        }, outerAppConfigVO.getAppType().equals(OuterAppConfigConstant.QY_WECHAT) ? OuterAppConfigConstant.DING : OuterAppConfigConstant.QY_WECHAT));
+        }, outerAppConfigVO.getAppType().equals(OuterAppConfigConstant.QY_WECHAT) ? OuterAppConfigConstant.DING : OuterAppConfigConstant.QY_WECHAT));*/
         if (Func.isNotEmpty(dingAppConfig) && dingAppConfig.getStatus().equals(CommonConstant.ENABLE)) {
             throw new ServiceException(MessageUtils.message("sys.outer.config.is.bind", new Object[0]));
         }
@@ -164,7 +103,7 @@
     @Override // org.springblade.modules.sync.service.IOuterAppConfigService
     public List<OuterAppConfigVO> getConfigs(Map<String, Object> params) {
         List<OuterAppConfig> list = list(Condition.getQueryWrapper(params, OuterAppConfig.class));
-        Map<Long, OuterAppConfig> configMap = (Map) list.parallelStream().collect(Collectors.toMap((v0) -> {
+        Map<Long, OuterAppConfig> configMap = list.parallelStream().collect(Collectors.toMap((v0) -> {
             return v0.getId();
         }, config -> {
             return config;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/sync/service/impl/WechatCallbackServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/sync/service/impl/WechatCallbackServiceImpl.java
index 0c4eef1..0efb9ce 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/sync/service/impl/WechatCallbackServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/sync/service/impl/WechatCallbackServiceImpl.java
@@ -1,14 +1,5 @@
 package com.qianwen.smartman.modules.sync.service.impl;
 
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.core.util.XmlUtil;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.jeecg.qywx.api.department.vo.Department;
-import java.lang.invoke.SerializedLambda;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -16,14 +7,22 @@
 import java.util.Objects;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
+
 import org.jeewx.api.mp.aes.AesException;
 import org.jeewx.api.mp.aes.WXBizMsgCrypt;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import com.qianwen.smartman.common.cache.RegionCache;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.jeecg.qywx.api.department.vo.Department;
 import com.qianwen.smartman.common.constant.CommonConstant;
 import com.qianwen.smartman.common.enums.CommonGroupTypeEnum;
 import com.qianwen.smartman.modules.cps.entity.CommonGroup;
+import com.qianwen.smartman.modules.cps.entity.CommonGroupOfItem;
 import com.qianwen.smartman.modules.cps.entity.Employee;
 import com.qianwen.smartman.modules.cps.entity.EmployeePost;
 import com.qianwen.smartman.modules.cps.mapper.CommonGroupMapper;
@@ -45,16 +44,17 @@
 import com.qianwen.smartman.modules.system.entity.UserOauth;
 import com.qianwen.smartman.modules.system.service.impl.PostServiceImpl;
 import com.qianwen.smartman.modules.system.service.impl.UserOauthServiceImpl;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.collection.ListUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.XmlUtil;
 
 @Service
 /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/sync/service/impl/WechatCallbackServiceImpl.class */
 public class WechatCallbackServiceImpl implements IWechatCallbackService {
     private static final Logger log = LoggerFactory.getLogger(WechatCallbackServiceImpl.class);
-    private final Map<WechatEventEnum, Consumer<String>> xmlParseMap = new HashMap();
+    private final Map<WechatEventEnum, Consumer<String>> xmlParseMap = new HashMap<>();
     private final WechatSyncServiceImpl wechatSyncService;
     private final PostServiceImpl postService;
     private final IEmployeePostService employeePostService;
@@ -65,144 +65,6 @@
     private final CommonGroupMapper commonGroupMapper;
     private final IOuterAppConfigService outerAppConfigService;
 
-    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 -1219083612:
-                if (implMethodName.equals("getOrganizationId")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case -129715105:
-                if (implMethodName.equals("getEmployeeId")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case -75080655:
-                if (implMethodName.equals("getUuid")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 517353092:
-                if (implMethodName.equals("getItemId")) {
-                    z = false;
-                    break;
-                }
-                break;
-            case 713563345:
-                if (implMethodName.equals("getPostId")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 799509265:
-                if (implMethodName.equals("getSource")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 1330288580:
-                if (implMethodName.equals("getGroupId")) {
-                    z = true;
-                    break;
-                }
-                break;
-        }
-        switch (z) {
-            case false:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/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.getOrganizationId();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/UserOauth") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getSource();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/UserOauth") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getUuid();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/UserOauth") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getUuid();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/UserOauth") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getUuid();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/EmployeePost") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getPostId();
-                    };
-                }
-                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.getPostId();
-                    };
-                }
-                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/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/modules/cps/entity/EmployeePost") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getEmployeeId();
-                    };
-                }
-                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/CommonGroupOfItem") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getGroupId();
-                    };
-                }
-                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;
-        }
-        throw new IllegalArgumentException("Invalid lambda deserialization");
-    }
 
     public WechatCallbackServiceImpl(final WechatSyncServiceImpl wechatSyncService, final PostServiceImpl postService, final IEmployeePostService employeePostService, final UserOauthServiceImpl userOauthService, final CommonGroupServiceImpl commonGroupService, final CommonGroupOfItemServiceImpl commonGroupOfItemService, final EmployeeServiceImpl employeeService, final CommonGroupMapper commonGroupMapper, final IOuterAppConfigService outerAppConfigService) {
         this.xmlParseMap.put(WechatEventEnum.USER_ADD_EVENT, this::parseUserAddEvent);
@@ -301,7 +163,7 @@
 
     private List<String> parseCallbackStr(String callbackData) {
         if (StrUtil.isEmpty(callbackData)) {
-            return new ArrayList();
+            return new ArrayList<>();
         }
         String[] dataArr = callbackData.split(",");
         return ListUtil.toList(dataArr);
@@ -417,11 +279,14 @@
             return;
         }
         QyUser qyUser = QyWechatApi.getUserById(userId);
+        UserOauth userOauth = this.userOauthService.getOne(Wrappers.<UserOauth>lambdaQuery().eq(UserOauth::getUuid, userId)
+        		.eq(UserOauth::getSource, "WECHAT_ENTERPRISE_WEB"), Boolean.TRUE.booleanValue());
+        /*
         UserOauth userOauth = (UserOauth) this.userOauthService.getOne((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
             return v0.getUuid();
         }, userId)).eq((v0) -> {
             return v0.getSource();
-        }, QyWechatConstant.QY_SOURCE), Boolean.TRUE.booleanValue());
+        }, QyWechatConstant.QY_SOURCE), Boolean.TRUE.booleanValue());*/
         this.wechatSyncService.createOrModifyEmployee(qyUser, userOauth);
     }
 
@@ -430,9 +295,11 @@
         if (StrUtil.isEmpty(userId)) {
             return;
         }
+        UserOauth userOauth = this.userOauthService.getOne(Wrappers.<UserOauth>lambdaQuery().eq(UserOauth::getUuid, userId));
+        /*
         UserOauth userOauth = (UserOauth) this.userOauthService.getOne((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
             return v0.getUuid();
-        }, userId));
+        }, userId));*/
         if (Objects.isNull(userOauth)) {
             return;
         }
@@ -442,16 +309,24 @@
             return;
         }
         this.employeeService.removeById(employee);
+        this.commonGroupOfItemService.remove(Wrappers.<CommonGroupOfItem>lambdaQuery()
+                .eq(CommonGroupOfItem::getGroupId, employee.getOrganizationId())
+                .eq(CommonGroupOfItem::getItemId, employee.getId()));
+        /*
         this.commonGroupOfItemService.remove((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
             return v0.getGroupId();
         }, employee.getOrganizationId())).eq((v0) -> {
             return v0.getItemId();
-        }, employee.getId()));
+        }, employee.getId()));*/
+        this.employeePostService.remove(Wrappers.<EmployeePost>lambdaQuery()
+                .eq(EmployeePost::getPostId, employee.getPostId())
+                .eq(EmployeePost::getEmployeeId, employee.getId()));
+        /*
         this.employeePostService.remove((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
             return v0.getPostId();
         }, employee.getPostId())).eq((v0) -> {
             return v0.getEmployeeId();
-        }, employee.getId()));
+        }, employee.getId()));*/
     }
 
     private void parseDeptAddEvent(String xmlBody) {
@@ -474,19 +349,24 @@
             return;
         }
         String localDeptId = QyWechatConstant.ID_SALT + deptId;
+        long count = this.employeeService.count(Wrappers.<Employee>lambdaQuery().eq(Employee::getOrganizationId, localDeptId));
+        /*
         long count = this.employeeService.count((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
             return v0.getOrganizationId();
-        }, localDeptId));
+        }, localDeptId));*/
         if (count > 0) {
             log.warn("[閮ㄩ棬鍒犻櫎鍥炶皟浜嬩欢].[褰撳墠閮ㄩ棬涓嬫湁{}涓憳宸ワ紝鏃犳硶鍒犻櫎]", Long.valueOf(count));
             return;
         }
         this.commonGroupMapper.removeOrgByIds(ListUtil.of(new String[]{localDeptId}));
+        this.commonGroupOfItemService.remove(Wrappers.<CommonGroupOfItem>lambdaQuery()
+                .eq(CommonGroupOfItem::getGroupId, localDeptId).eq(CommonGroupOfItem::getGroupType, CommonGroupTypeEnum.ORGANIZATION.getName()));
+        /*
         this.commonGroupOfItemService.remove((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
             return v0.getGroupId();
         }, localDeptId)).eq((v0) -> {
             return v0.getGroupType();
-        }, CommonGroupTypeEnum.ORGANIZATION.getName()));
+        }, CommonGroupTypeEnum.ORGANIZATION.getName()));*/
     }
 
     private void parseTagModifyEvent(String xmlBody) {
@@ -505,11 +385,14 @@
             List<Employee> employees = getEmpList(tagBody.getDeleteList());
             employees.forEach(emp -> {
                 String handlerPostId = handlerPostId(Boolean.TRUE, emp.getPostId(), tagBody.getTagId());
+                this.employeePostService.remove(Wrappers.<EmployeePost>lambdaQuery().eq(EmployeePost::getPostId, tagBody.getTagId())
+                		.eq(EmployeePost::getEmployeeId, emp.getId()));
+                /*
                 this.employeePostService.remove((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
                     return v0.getPostId();
                 }, tagBody.getTagId())).eq((v0) -> {
                     return v0.getEmployeeId();
-                }, emp.getId()));
+                }, emp.getId()));*/
                 emp.setPostId(handlerPostId);
             });
             this.employeeService.updateBatchById(employees);
@@ -552,13 +435,15 @@
     }
 
     private List<Employee> getEmpList(List<String> userIds) {
+    	List<UserOauth> auths = this.userOauthService.list(Wrappers.<UserOauth>lambdaQuery().in(UserOauth::getUuid, userIds));
+    	/*
         List<UserOauth> auths = this.userOauthService.list((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
             return v0.getUuid();
-        }, userIds));
+        }, userIds));*/
         if (CollectionUtil.isEmpty(auths)) {
-            return new ArrayList();
+            return new ArrayList<>();
         }
-        List<Long> empIds = (List) auths.parallelStream().map((v0) -> {
+        List<Long> empIds = auths.parallelStream().map((v0) -> {
             return v0.getUserId();
         }).collect(Collectors.toList());
         return this.employeeService.listByIds(empIds);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/sync/service/impl/WechatSyncServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/sync/service/impl/WechatSyncServiceImpl.java
index e3c9ee3..eae7caf 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/sync/service/impl/WechatSyncServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/sync/service/impl/WechatSyncServiceImpl.java
@@ -1,21 +1,6 @@
 package com.qianwen.smartman.modules.sync.service.impl;
 
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.date.TimeInterval;
-import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.IdUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONObject;
-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.toolkit.Wrappers;
-import com.jeecg.qywx.api.department.vo.Department;
 import java.io.File;
-import java.lang.invoke.SerializedLambda;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
@@ -27,18 +12,27 @@
 import java.util.StringJoiner;
 import java.util.concurrent.Callable;
 import java.util.stream.Collectors;
+
 import org.apache.rocketmq.client.producer.SendResult;
 import org.apache.rocketmq.spring.core.RocketMQTemplate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import com.qianwen.smartman.common.cache.RegionCache;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.messaging.support.MessageBuilder;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.DefaultTransactionDefinition;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.jeecg.qywx.api.department.vo.Department;
+import com.qianwen.core.log.exception.ServiceException;
+import com.qianwen.core.redis.cache.BladeRedis;
+import com.qianwen.core.tool.api.R;
 import com.qianwen.smartman.common.constant.CommonConstant;
 import com.qianwen.smartman.common.constant.DateConstant;
 import com.qianwen.smartman.common.enums.CommonGroupTypeEnum;
 import com.qianwen.smartman.common.utils.MessageUtils;
-import com.qianwen.core.log.exception.ServiceException;
-import com.qianwen.core.redis.cache.BladeRedis;
-import com.qianwen.core.tool.api.R;
 import com.qianwen.smartman.modules.cps.entity.CommonGroup;
 import com.qianwen.smartman.modules.cps.entity.CommonGroupOfItem;
 import com.qianwen.smartman.modules.cps.entity.Employee;
@@ -69,12 +63,16 @@
 import com.qianwen.smartman.modules.system.service.IParamService;
 import com.qianwen.smartman.modules.system.service.IPostService;
 import com.qianwen.smartman.modules.system.service.IUserOauthService;
-import org.springframework.jdbc.datasource.DataSourceTransactionManager;
-import org.springframework.messaging.support.MessageBuilder;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.TransactionStatus;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.support.DefaultTransactionDefinition;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.date.TimeInterval;
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONObject;
 
 @Service
 /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/sync/service/impl/WechatSyncServiceImpl.class */
@@ -95,131 +93,12 @@
     private final BladeRedis bladeRedis;
     private final IParamService paramService;
     private List<Department> departments;
-    private final Map<WechatResponseEnum, QyWechatSync> syncMethod = new HashMap();
+    private final Map<WechatResponseEnum, QyWechatSync> syncMethod = new HashMap<>();
 
     /* JADX INFO: Access modifiers changed from: package-private */
     @FunctionalInterface
-    /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/sync/service/impl/WechatSyncServiceImpl$QyWechatSync.class */
-    public interface QyWechatSync {
+    interface QyWechatSync {
         void sync() throws Exception;
-    }
-
-    private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
-        String implMethodName = lambda.getImplMethodName();
-        boolean z = true;
-        switch (implMethodName.hashCode()) {
-            case -1249349403:
-                if (implMethodName.equals("getTel")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case -75080655:
-                if (implMethodName.equals("getUuid")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 98245393:
-                if (implMethodName.equals("getId")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 242925765:
-                if (implMethodName.equals("getAppType")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 799509265:
-                if (implMethodName.equals("getSource")) {
-                    z = false;
-                    break;
-                }
-                break;
-            case 1722789684:
-                if (implMethodName.equals("getLastSyncTime")) {
-                    z = true;
-                    break;
-                }
-                break;
-        }
-        switch (z) {
-            case false:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/UserOauth") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getSource();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/UserOauth") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getSource();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/UserOauth") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getUuid();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/UserOauth") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getUuid();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/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/sync/entity/OuterAppConfig") && lambda.getImplMethodSignature().equals("()Ljava/util/Date;")) {
-                    return (v0) -> {
-                        return v0.getLastSyncTime();
-                    };
-                }
-                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/sync/entity/OuterAppConfig") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getAppType();
-                    };
-                }
-                break;
-        }
-        throw new IllegalArgumentException("Invalid lambda deserialization");
     }
 
     public WechatSyncServiceImpl(final IPostService iPostService, final PostMapper postMapper, final ICommonGroupService commonGroupService, final ICommonGroupOfItemService commonGroupOfItemService, final IEmployeeService iEmployeeService, final IUserOauthService userOauthService, final CommonGroupMapper commonGroupMapper, final IEmployeePostService employeePostService, final DataSourceTransactionManager dataSourceTransactionManager, final RocketMQTemplate rocketMQTemplate, final OuterAppConfigServiceImpl outerAppConfigService, final SseEmitterServer sseEmitterServer, final BladeRedis bladeRedis, final IParamService paramService, final List<Department> departments) {
@@ -272,11 +151,15 @@
             try {
                 Boolean isExecSuccess = execSync();
                 if (isExecSuccess.booleanValue()) {
+                	this.outerAppConfigService.update(Wrappers.<OuterAppConfig>lambdaUpdate()
+                			.eq(OuterAppConfig::getAppType, OuterAppConfigConstant.QY_WECHAT)
+                			.set(OuterAppConfig::getLastSyncTime, new Date()));
+                	/*
                     this.outerAppConfigService.update((Wrapper) ((LambdaUpdateWrapper) Wrappers.lambdaUpdate().eq((v0) -> {
                         return v0.getAppType();
                     }, OuterAppConfigConstant.QY_WECHAT)).set((v0) -> {
                         return v0.getLastSyncTime();
-                    }, new Date()));
+                    }, new Date()));*/
                     this.dataSourceTransactionManager.commit(transStatus);
                     log.info("[浼佷笟寰俊鍚屾缁勭粐鏋舵瀯].[syncOrganization success consuming={}绉抅", Long.valueOf(timer.intervalSecond()));
                 } else {
@@ -310,20 +193,22 @@
             return;
         }
         List<UserOauth> oauthList = getUserOauthByUuid(userList);
-        Map<String, UserOauth> oauthMap = (Map) oauthList.parallelStream().collect(Collectors.toMap((v0) -> {
+        Map<String, UserOauth> oauthMap = oauthList.parallelStream().collect(Collectors.toMap((v0) -> {
             return v0.getUuid();
         }, user -> {
             return user;
-        }, old, newVal -> {
+        }, (old, newVal) -> {
             return old;
         }));
         initEmpData(oauthList);
-        List<Long> empIds = (List) oauthList.stream().map((v0) -> {
+        List<Long> empIds = oauthList.stream().map((v0) -> {
             return v0.getUserId();
         }).collect(Collectors.toList());
+        List<Employee> employeeList = this.iEmployeeService.list(Wrappers.<Employee>lambdaQuery().in(CollectionUtil.isNotEmpty(empIds), Employee::getId, empIds));
+        /*
         List<Employee> employeeList = this.iEmployeeService.list(Wrappers.lambdaQuery().in(CollectionUtil.isNotEmpty(empIds), (v0) -> {
             return v0.getId();
-        }, empIds));
+        }, empIds));*/
         Map<String, Employee> syncEmp = convertEmpToMap(oauthList, employeeList);
         List<UserOauth> userOauthList = new ArrayList<>();
         userList.forEach(userDept -> {
@@ -355,15 +240,19 @@
             this.iEmployeeService.remove(null);
             return;
         }
+        List<Long> empIds = userOauthList.stream().map(UserOauth::getUserId).filter(Objects::nonNull).collect(Collectors.toList());
+        /*
         List<Long> empIds = (List) userOauthList.stream().map((v0) -> {
             return v0.getUserId();
         }).filter((v0) -> {
             return Objects.nonNull(v0);
-        }).collect(Collectors.toList());
+        }).collect(Collectors.toList());*/
         if (CollectionUtil.isNotEmpty(empIds)) {
+        	this.iEmployeeService.remove(Wrappers.<Employee>lambdaQuery().notIn(Employee::getId, empIds));
+        	/*
             this.iEmployeeService.remove((Wrapper) Wrappers.lambdaQuery().notIn((v0) -> {
                 return v0.getId();
-            }, empIds));
+            }, empIds));*/
         } else {
             this.iEmployeeService.remove(null);
         }
@@ -371,16 +260,19 @@
 
     private List<UserOauth> getUserOauthByUuid(List<QyUser> qyUsers) {
         if (CollectionUtil.isEmpty(qyUsers)) {
-            return new ArrayList();
+            return new ArrayList<>();
         }
-        List<String> qyUserIds = (List) qyUsers.stream().map((v0) -> {
+        List<String> qyUserIds = qyUsers.stream().map((v0) -> {
             return v0.getUserid();
         }).collect(Collectors.toList());
+        
+        return this.userOauthService.list(Wrappers.<UserOauth>lambdaQuery().eq(UserOauth::getSource, QyWechatConstant.QY_SOURCE).in(UserOauth::getUuid, qyUserIds));
+        /*
         return this.userOauthService.list((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
             return v0.getSource();
         }, QyWechatConstant.QY_SOURCE)).in((v0) -> {
             return v0.getUuid();
-        }, qyUserIds));
+        }, qyUserIds));*/
     }
 
     private Map<String, Employee> convertEmpToMap(List<UserOauth> userOauthList, List<Employee> employees) {
@@ -388,11 +280,11 @@
         if (CollectionUtil.isEmpty(userOauthList) || CollectionUtil.isEmpty(employees)) {
             return result;
         }
-        Map<Long, UserOauth> oauthMap = (Map) userOauthList.stream().collect(Collectors.toMap((v0) -> {
+        Map<Long, UserOauth> oauthMap = userOauthList.stream().collect(Collectors.toMap((v0) -> {
             return v0.getUserId();
         }, ua -> {
             return ua;
-        }, old, newVal -> {
+        }, (old, newVal) -> {
             return old;
         }));
         for (Employee employee : employees) {
@@ -408,7 +300,7 @@
         List<CommonGroupOfItem> commonGroupOfItems = new ArrayList<>();
         List<EmployeePost> employeePosts = new ArrayList<>();
         Map<String, StringJoiner> userTagMap = QyWechatApi.getUserTagMap();
-        employeeMap.forEach(userId, employee -> {
+        employeeMap.forEach((userId, employee) -> {
             CommonGroupOfItem commonGroupOfItem = setItem(employee.getId(), Long.valueOf(employee.getOrganizationId()));
             commonGroupOfItems.add(commonGroupOfItem);
             employeePosts.addAll(employeePosts(employee, userId, userTagMap));
@@ -429,7 +321,7 @@
         });
         List<QyUser> userList = ThreadPoolUtil.createTaskList(taskList);
         HashSet<QyUser> result = new HashSet<>(userList);
-        return new ArrayList(result);
+        return new ArrayList<>(result);
     }
 
     @Override // org.springblade.modules.sync.service.IWechatSyncService
@@ -621,20 +513,24 @@
 
     @Transactional
     public void singleUserBind(QyUser user, Long empId, String clientId) {
+    	UserOauth userOauth = this.userOauthService.getOne(Wrappers.<UserOauth>lambdaQuery().eq(UserOauth::getUuid, user.getUserid()).eq(UserOauth::getSource, QyWechatConstant.QY_SOURCE), Boolean.TRUE.booleanValue());
+    	/*
         UserOauth userOauth = (UserOauth) this.userOauthService.getOne((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
             return v0.getUuid();
         }, user.getUserid())).eq((v0) -> {
             return v0.getSource();
-        }, QyWechatConstant.QY_SOURCE), Boolean.TRUE.booleanValue());
+        }, QyWechatConstant.QY_SOURCE), Boolean.TRUE.booleanValue());*/
         if (Objects.isNull(userOauth)) {
             this.sseEmitterServer.sendMsg(clientId, MessageUtils.message("sys.outer.user.not.exist", new Object[0]), SseEventEnum.ERROR_MSG_ID.getEventId());
             throw new ServiceException(MessageUtils.message("sys.outer.user.not.exist", new Object[0]));
         }
+        Employee employee = this.iEmployeeService.getOne(Wrappers.<Employee>lambdaQuery().eq(Employee::getTel, user.getMobile()).eq(Employee::getId, empId));
+        /*
         Employee employee = (Employee) this.iEmployeeService.getOne((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
             return v0.getTel();
         }, user.getMobile())).eq((v0) -> {
             return v0.getId();
-        }, empId));
+        }, empId));*/
         if (Objects.isNull(employee)) {
             this.sseEmitterServer.sendMsg(clientId, MessageUtils.message("cps.employee.outer.app.not.have.mobile", new Object[0]), SseEventEnum.ERROR_MSG_ID.getEventId());
             throw new ServiceException(MessageUtils.message("cps.employee.outer.app.not.have.mobile", new Object[0]));
@@ -654,14 +550,18 @@
     public Employee createOrModifyEmployee(QyUser qyUser, UserOauth userOauth) {
         Employee employee = null;
         if (!Objects.isNull(userOauth)) {
+        	employee = this.iEmployeeService.getOne(Wrappers.<Employee>lambdaQuery().eq(Employee::getId, userOauth.getUserId())); 
+        	/*
             employee = (Employee) this.iEmployeeService.getOne((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
                 return v0.getId();
-            }, userOauth.getUserId()));
+            }, userOauth.getUserId()));*/
         }
         if (Objects.isNull(employee)) {
+        	employee = this.iEmployeeService.getOne(Wrappers.<Employee>lambdaQuery().eq(Employee::getTel, qyUser.getMobile()), true); 
+        	/*
             employee = (Employee) this.iEmployeeService.getOne((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
                 return v0.getTel();
-            }, qyUser.getMobile()), Boolean.TRUE.booleanValue());
+            }, qyUser.getMobile()), Boolean.TRUE.booleanValue());*/
         }
         Employee employee2 = setEmpAttribute(qyUser, employee);
         this.iEmployeeService.saveOrUpdate(employee2);
@@ -684,11 +584,11 @@
     private List<EmployeePost> employeePosts(Employee employee, String userId, Map<String, StringJoiner> userTagMap) {
         List<EmployeePost> result = new ArrayList<>();
         if (CollectionUtil.isEmpty(userTagMap)) {
-            return new ArrayList();
+            return new ArrayList<>();
         }
         StringJoiner postIdJoiner = userTagMap.get(userId);
         if (Objects.isNull(postIdJoiner)) {
-            return new ArrayList();
+            return new ArrayList<>();
         }
         employee.setPostId(postIdJoiner.toString());
         String[] postIds = postIdJoiner.toString().split(",");
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/sync/util/CodeUtil.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/sync/util/CodeUtil.java
index d18924e..d333dda 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/sync/util/CodeUtil.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/sync/util/CodeUtil.java
@@ -57,11 +57,11 @@
     }
 
     public static String getLoginCodeCacheKey(String fileName) {
-        return QyWechatConstant.CODE_KEY + QyWechatConstant.QY_CODE_LOGIN_TYPE + SystemPropertyUtils.VALUE_SEPARATOR + fileName;
+        return QyWechatConstant.CODE_KEY + QyWechatConstant.QY_CODE_LOGIN_TYPE + ":" + fileName;
     }
 
     public static String getBindCodeCacheKey(String fileName, Long empId) {
-        return QyWechatConstant.CODE_KEY + QyWechatConstant.QY_CODE_BIND_TYPE + SystemPropertyUtils.VALUE_SEPARATOR + fileName + SystemPropertyUtils.VALUE_SEPARATOR + empId;
+        return QyWechatConstant.CODE_KEY + QyWechatConstant.QY_CODE_BIND_TYPE + ":" + fileName + ":" + empId;
     }
 
     public static String codeFileToBase64(File codeFile) {

--
Gitblit v1.9.3