Merge remote-tracking branch 'origin/feature/REQ-2960'

This commit is contained in:
周敏 2024-09-20 13:52:12 +08:00
commit 85425c2741

View File

@ -5,7 +5,6 @@ import cn.axzo.basics.profiles.dto.basic.PersonProfileDto;
import cn.axzo.framework.domain.ServiceException;
import cn.axzo.riven.client.common.enums.ThirdCodeEnum;
import cn.axzo.riven.third.common.AesUtil;
import cn.axzo.riven.third.common.DingTalkUtil;
import cn.axzo.riven.third.common.enums.SyncTypeEnum;
import cn.axzo.riven.third.dao.ThirdPersonDao;
import cn.axzo.riven.third.dao.ThirdProjectDao;
@ -33,6 +32,7 @@ import cn.axzo.riven.third.taizhou.rpc.res.TazZhouProjectRes;
import cn.axzo.riven.third.taizhou.service.TaiZhouService;
import com.alibaba.fastjson.JSON;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -283,10 +283,14 @@ public class TaiZhouServiceImpl implements TaiZhouService {
return !CollectionUtils.isEmpty(list);
}
@Override
public void handlePerson(ThirdPerson thirdPerson, TaiZhouProject taiZhouProject) {
// 如果手机号解密失败了本次不处理待下次同步
if (StringUtils.contains(thirdPerson.getThirdPersonPhone(), "*")) {
log.warn("泰州人员:{}{}{} 手机号解密失败,本次忽略处理",
thirdPerson.getThirdPersonName(), thirdPerson.getThirdPersonPhone(), thirdPerson.getThirdUniquePersonId());
return;
}
log.info("泰州人员:{} 开始处理", thirdPerson.getThirdPersonName());
ThirdPerson oldThirdPerson = queryThirdPerson(thirdPerson);
//如果数据库为空则插入