Browse Source

1.修改日志部门

WoNiu 3 years ago
parent
commit
bf1b4b5c82

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

@@ -133,12 +133,12 @@ public class LogDownloadService {
                     if (!StringUtils.isEmpty(chuanyunLogDO.getDepartment())){
                     if (!StringUtils.isEmpty(chuanyunLogDO.getDepartment())){
                         chuanyunLogDO.setDepartmentName(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{
                 try{
                     if(!ChuanYunConstant.PRODUCTION_PROJECT.equals(chuanyunDayLog.getProjectType())&& StringUtils.isEmpty(chuanyunDayLog.getProjectId())){
                     if(!ChuanYunConstant.PRODUCTION_PROJECT.equals(chuanyunDayLog.getProjectType())&& StringUtils.isEmpty(chuanyunDayLog.getProjectId())){