Explorar el Código

1.修改集团日志部门字段

WoNiu hace 3 años
padre
commit
a01c711adb

+ 8 - 3
src/main/java/com/galaxis/manatee/service/LogDownloadService.java

@@ -130,10 +130,15 @@ public class LogDownloadService {
                         chuanyunLogDO.setDepartmentName(chuanyunUserDepartmentNameDO.getDepartmentName());
                     }
                 }else {
-                    ChuanyunUserCompanyDO chuanyunUserCompanyDO = chuanyunUserCompanyDao.findByUserId(chuanyunLogDO.getUserObject().getObjectId());
-                    if (chuanyunUserCompanyDO!=null){
-                        chuanyunLogDO.setDepartmentName(getDepartmentName(chuanyunUserCompanyDO.getDepartment()));
+                    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())){