Merge remote-tracking branch 'origin/master'

attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserTaskImpl.java

@@ -65,12 +65,10 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
             log.info("同步用户");
             staffService.syncPersons(null);
             log.info("同步钉钉usreId");
-
+            try {
                 List<UserEntity> userList = userService.getCacheList().stream()
                         .filter(f -> !ObjectUtils.isEmpty(f.getCustomerId()))
                         .filter(f -> ObjectUtils.isEmpty(f.getDingUserId())).collect(Collectors.toList());
-
-
                 List<UserEntity> updateUserList = userList.stream().map(item -> {
                     UserEntity userEntity = new UserEntity();
                     userEntity.setId(item.getId());
@@ -96,11 +94,14 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
                     userEntity.setUpdateTime(new Date());
                     userEntity.setUpdateUserId(1L);
                     return userEntity;
-            }).collect(Collectors.toList());
+                }).filter(f -> !ObjectUtils.isEmpty(f.getDingUserId())).collect(Collectors.toList());
 
-            if(!ObjectUtils.isEmpty(updateUserList)){
-                 log.info("更新用户钉钉id信息数量：{}",updateUserList.size());
-                 userService.update(updateUserList);
+                if (!ObjectUtils.isEmpty(updateUserList)) {
+                    log.info("更新用户钉钉id信息数量：{}", updateUserList.size());
+                    userService.getUserDao().updateBatch(updateUserList);
+                }
+            } catch (Exception e) {
+                log.error("同步钉钉usreId失败");
             }
         } catch (Exception e) {
             log.error("同步人事异常", e);