oa修改员工信息

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

@@ -199,18 +199,19 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
         }
 
         employeeDao.update(employee);
-        //删除当前用户角色
-        employeeDao.delEmployeeRole(employee.getId());
         //新增用户角色
         Integer tenantId = TenantContextHolder.getTenantId();
         if(employee.getRoleIds() != null && employee.getRoleIds().size() > 0){
+            //删除当前用户角色
+            employeeDao.delEmployeeRole(employee.getId());
             employeeDao.batchAddEmployeeRole(employee.getId(), employee.getRoleIds(), tenantId);
         }
-
-        //删除用户职位
-        employeePositionService.delPosition(employee.getId(), tenantId);
-        //添加职位
-        employeePositionService.batchAddPosition(employee.getId(), employee.getPositionIds(), tenantId);
+        if(Objects.nonNull(employee.getPositionIds()) && employee.getPositionIds().size() > 0){
+            //删除用户职位
+            employeePositionService.delPosition(employee.getId(), tenantId);
+            //添加职位
+            employeePositionService.batchAddPosition(employee.getId(), employee.getPositionIds(), tenantId);
+        }
         teacherDao.updateUser(employee);
         imGroupDao.updateNickname(employee.getUserId(), employee.getRealName());
         imGroupDao.updateUserFriendNickname(employee.getUserId(), employee.getRealName());