yurk 2 years ago
parent
commit
9714b52d25

+ 11 - 1
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java

@@ -563,6 +563,11 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                             .setProviderNames(providerNames);
                     if(companyId==862){
                         project.setBuId(buId);
+                        Department department = departmentMapper.selectById(buId);
+                        if(department.getManagerId()==null){
+                            httpRespMsg.setError("当前设置BU不存在负责人,请设置");
+                            return httpRespMsg;
+                        }
                     }
                     if(timeType.getOutputValueStatus()==1){
                         project.setOutputValue(outputValue==null?0.00:outputValue);
@@ -668,7 +673,12 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                                 convertDepartmentIdToCascade(deptId))
                         .setProviderNames(providerNames);
                 if(companyId==862){
-                        p.setBuId(buId);
+                    p.setBuId(buId);
+                    Department department = departmentMapper.selectById(buId);
+                    if(department.getManagerId()==null){
+                        httpRespMsg.setError("当前设置BU不存在负责人,请设置");
+                        return httpRespMsg;
+                    }
                 }
                 //编辑项目合同修改 添加记录
                 if(contractAmount!=null&&project.getContractAmount().doubleValue()!=contractAmount){

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

@@ -1621,7 +1621,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                                     r.setAuditDeptManagerid(department.get().getManagerId());
                                     r.setIsDeptAudit(1);
                                     r.setAuditDeptid(department.get().getDepartmentId());
-                                    if(department.get().getManagerId().equals(r.getProjectAuditorId())){
+                                    if(department.get().getManagerId()!=null&&department.get().getManagerId().equals(r.getProjectAuditorId())){
                                         r.setState(1);
                                         r.setDepartmentAuditState(1);
                                     }