|
@@ -514,6 +514,12 @@ public class ReportController {
|
|
|
multiDegrId[i] = null;
|
|
|
}
|
|
|
}
|
|
|
+ if (reportTargetDeptId == null) {
|
|
|
+ reportTargetDeptId = new Integer[projectId.length];
|
|
|
+ for (int i=0;i<reportTargetDeptId.length; i++) {
|
|
|
+ reportTargetDeptId[i] = null;
|
|
|
+ }
|
|
|
+ }
|
|
|
if (company.getPackageProject() == 1) {
|
|
|
//检查是否设置了预算的工时预警
|
|
|
ProjectBasecostSetting alarmSetting = projectBasecostSettingMapper.selectOne(new QueryWrapper<ProjectBasecostSetting>()
|
|
@@ -890,7 +896,7 @@ public class ReportController {
|
|
|
report.setStage(stage[i]);
|
|
|
report.setCreateDate(localStartDate);
|
|
|
report.setCreatorId(token);
|
|
|
- report.setDeptId(reportTargetDeptId!=null && reportTargetDeptId.length>0?reportTargetDeptId[i]:user.getDepartmentId());
|
|
|
+ report.setDeptId(reportTargetDeptId[i]!=null?reportTargetDeptId[i]:user.getDepartmentId());
|
|
|
report.setProjectAuditState(0);
|
|
|
report.setProjectAuditorId(projectAuditorId[i]);
|
|
|
report.setTaskFinish(taskFinish[i]);
|
|
@@ -1003,7 +1009,7 @@ public class ReportController {
|
|
|
report.setPicStr(picStr!=null?picStr[i]:null);
|
|
|
report.setCreateDate(LocalDate.parse(createDate[i], DateTimeFormatter.ofPattern("yyyy-MM-dd")));
|
|
|
report.setCreatorId(token);
|
|
|
- report.setDeptId(reportTargetDeptId!=null && reportTargetDeptId.length>0?reportTargetDeptId[i]:user.getDepartmentId());
|
|
|
+ report.setDeptId(reportTargetDeptId[i]!=null?reportTargetDeptId[i]:user.getDepartmentId());
|
|
|
report.setProjectAuditState(0);
|
|
|
report.setProjectAuditorId(projectAuditorId[i]);
|
|
|
report.setTaskFinish(taskFinish[i]);
|