|
@@ -133,12 +133,12 @@ public class LogDownloadService {
|
|
|
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()));
|
|
|
-// }
|
|
|
-// }
|
|
|
+ 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())){
|