浏览代码

fix员工默认头像

Eric 1 年之前
父节点
当前提交
920b7de7a3
共有 1 个文件被更改,包括 15 次插入6 次删除
  1. 15 6
      mec-biz/src/main/java/com/ym/mec/biz/service/impl/EmployeeServiceImpl.java

+ 15 - 6
mec-biz/src/main/java/com/ym/mec/biz/service/impl/EmployeeServiceImpl.java

@@ -141,7 +141,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
     @Transactional(rollbackFor = Exception.class)
     public void add(Employee employee) {
         RBucket<String> bucket = redissonClient.getBucket("add_employee_lock" + employee.getPhone());
-        if (!bucket.trySet(employee.getPhone(), 1l, TimeUnit.SECONDS)) {
+        if (!bucket.trySet(employee.getPhone(), 1L, TimeUnit.SECONDS)) {
             throw new BizException("请勿重复提交");
         }
         SysUser user = teacherDao.getUserWithPhone(employee.getPhone());
@@ -149,6 +149,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
             throw new BizException("用户已存在学校账户");
         }
         Integer tenantId = employee.getTenantId();
+
         if (user != null && user.getId() != null) {
             checkTenantId(tenantId, user.getTenantId());
             Employee employee1 = employeeDao.get(user.getId());
@@ -175,6 +176,11 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
                 }
                 employee.setUserType(user.getUserType() + ",SYSTEM");
                 teacherDao.updateUser(employee);
+
+                // 用户更新信息同步到三方
+                if (Objects.nonNull(employee.getId())) {
+                    registerImUserInfo(employee.getId());
+                }
                 return;
             } else {
                 throw new BizException("员工已存在");
@@ -214,10 +220,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
         addUserTenant(employee.getTenantIds(), tenantId, userId);
         //添加到OA
         oaUserService.addOaUser(employee);
-        // 用户更新信息同步到三方
-        if (Objects.nonNull(employee.getId())) {
-            registerImUserInfo(employee.getId());
-        }
+
     }
 
     /**
@@ -313,7 +316,9 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
         });
 
         // 用户更新信息同步到三方
-        registerImUserInfo(employee.getId());
+        if (Objects.nonNull(employee.getId())) {
+            registerImUserInfo(employee.getId());
+        }
     }
 
     @Override
@@ -740,6 +745,10 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
 
     }
 
+    /**
+     *  用户更新信息同步到三方
+     * @param userId 用户id
+     */
     private void registerImUserInfo(Integer userId) {
         SysUser userInfo = teacherDao.getUser(userId);
         if (Objects.nonNull(userInfo)) {