|
@@ -130,7 +130,16 @@ public class PersonIntegrationServiceImpl implements PersonIntegrationService {
|
|
|
if(!userIds.isEmpty()){
|
|
|
lastWorkExps=workExpMapper.selectBatchUserLastOne(userIds);
|
|
|
}
|
|
|
- lastWorkExps.forEach(item->expMap.put(item.getUserId(),item));
|
|
|
+ lastWorkExps.forEach(item->{
|
|
|
+ if(null==item.getStartTime()){
|
|
|
+ expMap.put(item.getUserId(), item);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ WorkExpDO workExpDO = expMap.get(item.getUserId());
|
|
|
+ if (null==workExpDO || workExpDO.getStartTime().compareTo(item.getStartTime())>1){
|
|
|
+ expMap.put(item.getUserId(), item);
|
|
|
+ }
|
|
|
+ });
|
|
|
result.getList().forEach(item -> {
|
|
|
// WorkExpDO lastWorkExp = workExpMapper.selectLastOne(item.getUser().getId());
|
|
|
// if (null != lastWorkExp) {
|