1.日志所属部门修改

src/main/java/com/galaxis/manatee/service/LogDownloadService.java

@@ -106,6 +106,19 @@ public class LogDownloadService {
      * @param chuanyunLogDO 待处理数据
      */
     private void updateChuanyunLogData(ChuanyunLogDO chuanyunLogDO){
+        //处理项目userId
+        if(chuanyunLogDO.getUserObject()!=null){
+            chuanyunLogDO.setUserId(chuanyunLogDO.getUserObject().getObjectId());
+        }
+        //日志人员所属部门名称
+        if (!StringUtils.isEmpty(chuanyunLogDO.getDepartment())){
+            chuanyunLogDO.setDepartmentName(chuanyunLogDO.getDepartment());
+        }else {
+            chuanyunLogDao.findById(chuanyunLogDO.getObjectId()).ifPresent(oldLogDO -> {
+                chuanyunLogDO.setDepartmentName(oldLogDO.getDepartmentName());
+            });
+        }
+        //处理数据
         if(chuanyunLogDO.getDayLogList()==null||chuanyunLogDO.getDayLogList().size()==0){
             chuanyunLogDO.setDayLogList(new ArrayList<>());
             log.warn(chuanyunLogDO+"");
@@ -129,16 +142,6 @@ public class LogDownloadService {
                     if (chuanyunUserDepartmentNameDO!=null){
                         chuanyunLogDO.setDepartmentName(chuanyunUserDepartmentNameDO.getDepartmentName());
                     }
-                }else {
-                    if (!StringUtils.isEmpty(chuanyunLogDO.getDepartment())){
-                        chuanyunLogDO.setDepartmentName(chuanyunLogDO.getDepartment());
-                    }
-                    else {
-                        ChuanyunUserCompanyDO chuanyunUserCompanyDO = chuanyunUserCompanyDao.findByUserId(chuanyunLogDO.getUserObject().getObjectId());
-                        if (chuanyunUserCompanyDO!=null){
-                            chuanyunLogDO.setDepartmentName(getDepartmentName(chuanyunUserCompanyDO.getDepartment()));
-                        }
-                    }
                 }
                 try{
                     if(!ChuanYunConstant.PRODUCTION_PROJECT.equals(chuanyunDayLog.getProjectType())&& StringUtils.isEmpty(chuanyunDayLog.getProjectId())){
@@ -153,10 +156,7 @@ public class LogDownloadService {
                 }
             });
         }
-        //处理项目userId
-        if(chuanyunLogDO.getUserObject()!=null){
-            chuanyunLogDO.setUserId(chuanyunLogDO.getUserObject().getObjectId());
-        }
+
     }
 
     private String getCharacters(String str){