Merge remote-tracking branch 'origin/master'

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

@@ -65,42 +65,43 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
             log.info("同步用户");
             staffService.syncPersons(null);
             log.info("同步钉钉usreId");
-
-            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());
-
-                String mobile = item.getMobile();
-                if (ObjectUtils.isEmpty(mobile)) {
-                    //根据customerId查询staff 看是否有
-                    StaffEntity staffCache = staffService.getCache(item.getCustomerId().toString());
-                    if (!ObjectUtils.isEmpty(staffCache) && !ObjectUtils.isEmpty(staffCache.getPhoneNumber())) {
-                        mobile = staffCache.getPhoneNumber();
-                        userEntity.setMobile(mobile);
+            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());
+
+                    String mobile = item.getMobile();
+                    if (ObjectUtils.isEmpty(mobile)) {
+                        //根据customerId查询staff 看是否有
+                        StaffEntity staffCache = staffService.getCache(item.getCustomerId().toString());
+                        if (!ObjectUtils.isEmpty(staffCache) && !ObjectUtils.isEmpty(staffCache.getPhoneNumber())) {
+                            mobile = staffCache.getPhoneNumber();
+                            userEntity.setMobile(mobile);
+                        }
                     }
-                }
-                if (!ObjectUtils.isEmpty(mobile)) {
-                    Rest<String> personByMobile = dingPersonService.getPersonByMobile(mobile);
-                    if (!ObjectUtils.isEmpty(personByMobile) &&
-                            YesNoEnum.YES.getValue() == personByMobile.getCode()
-                            && !ObjectUtils.isEmpty(personByMobile.getData())) {
-                        userEntity.setDingUserId(personByMobile.getData());
+                    if (!ObjectUtils.isEmpty(mobile)) {
+                        Rest<String> personByMobile = dingPersonService.getPersonByMobile(mobile);
+                        if (!ObjectUtils.isEmpty(personByMobile) &&
+                                YesNoEnum.YES.getValue() == personByMobile.getCode()
+                                && !ObjectUtils.isEmpty(personByMobile.getData())) {
+                            userEntity.setDingUserId(personByMobile.getData());
+                        }
                     }
-                }
 
-                userEntity.setUpdateTime(new Date());
-                userEntity.setUpdateUserId(1L);
-                return userEntity;
-            }).collect(Collectors.toList());
+                    userEntity.setUpdateTime(new Date());
+                    userEntity.setUpdateUserId(1L);
+                    return userEntity;
+                }).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);