sync模块修复

yangys

2024-04-01 a36d93e531c292240dc59cb8e712b2eca21a4066

 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);
        }