oa员工修改

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

@@ -35,6 +35,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import java.io.FileNotFoundException;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
@@ -230,9 +231,15 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
         //更新用户与机构的关系
         sysUserTenantService.deleteByUserId(employee.getId());
         addUserTenant(employee.getTenantIds(), employee.getTenantId(), employee.getId());
-
-        //更新OA信息
-        oaUserService.updateOaUser(employee);
+        ExecutorService executor = Executors.newCachedThreadPool();
+        CompletableFuture.runAsync(()->{
+            try {
+                //更新OA信息
+                oaUserService.updateOaUser(employee);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        },executor);
     }
 
     @Override

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

@@ -1387,7 +1387,7 @@ public class ExportServiceImpl implements ExportService {
         CompletableFuture.runAsync(()->{
             try {
                 this.routeOrderList(params, managerDownload, headColumns);
-            } catch (FileNotFoundException e) {
+            } catch (Exception e) {
                 e.printStackTrace();
             }
         },executor);

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

@@ -12,6 +12,7 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 
@@ -51,11 +52,15 @@ public class OaServiceImpl implements OaUserService {
         oaUser.setNickName(employee.getRealName());
         oaUser.setPhone(employee.getPhone());
         oaUser.setSex(employee.getGender().toString());
-        oaUser.setDeptId(employee.getDeptId());
-        oaUser.setDeptIds(JSON.parseArray(employee.getDeptIds(), Integer.class));
         oaUser.setAvatar(employee.getAvatar());
-        oaUser.setPostDeptIds(JSON.parseArray(employee.getPostDeptIds(), PostDept.class));
-        if (oaUser.getPostDeptIds() != null) {
+        if(Objects.nonNull(employee.getDeptId())){
+            oaUser.setDeptId(employee.getDeptId());
+        }
+        if(Objects.nonNull(employee.getDeptIds())){
+            oaUser.setDeptIds(JSON.parseArray(employee.getDeptIds(), Integer.class));
+        }
+        if(Objects.nonNull(employee.getPostDeptIds())){
+            oaUser.setPostDeptIds(JSON.parseArray(employee.getPostDeptIds(), PostDept.class));
             List<Integer> postIds = oaUser.getPostDeptIds().stream().map(PostDept::getPostId).collect(Collectors.toList());
             oaUser.setPostIds(postIds);
         }