1

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ReportController.java

@@ -1362,7 +1362,7 @@ public class ReportController {
                                         } else {
                                             //检查是否超过预设的提醒百分比;设置的数值是剩余的百分比
                                             if (hasReport.divide(multiply, 2, RoundingMode.HALF_UP).multiply(new BigDecimal(100)).compareTo(new BigDecimal(100 - estimateTimeSetting.getGroupWarningPercent())) > 0) {
-                                                warningGroupPercent += (tgp.getTaskGroupCode() != null?tgp.getTaskGroupCode():"")+"-"+tgp.getName() + ",";
+                                                warningGroupPercent += (tgp.getTaskGroupCode() != null?tgp.getTaskGroupCode()+"-":"")+tgp.getName() + ",";
                                                 sendReportTimeWarningMsg(company, null, first.get().getProjectName(), tgp);
                                             }
                                         }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -625,10 +625,9 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                         r.setWorktimeList(list);
                     }
                 }
-
+                Project project = allProjectList.stream().filter(p -> p.getId().equals(r.getProjectId())).findFirst().get();
                 //处理维度列表数据
                 if (timeTypeMapper.selectById(companyId).getCustomDegreeActive() == 1) {
-                    Project project = allProjectList.stream().filter(p -> p.getId().equals(r.getProjectId())).findFirst().get();
                     String associateDegrees = project.getAssociateDegrees();
                     List<HashMap> degreeMapList = new ArrayList<>();
                     if (associateDegrees != null) {
@@ -677,7 +676,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 //项目的审核人
                 if (reportAuditType == 0) {
                     //对于简单模式的非项目，直接获取部门主管作为审核人
-                    if (company.getNonProjectSimple() == 1) {
+                    if (company.getNonProjectSimple() == 1 && project.getIsPublic() == 1) {
                         User user = userMapper.selectById(r.getCreatorId());
                         Department department = departmentMapper.selectById(user.getDepartmentId());
                         if (department != null) {