|
@@ -1210,7 +1210,7 @@ public class ReportController {
|
|
|
hasReport = new BigDecimal(groupSum).add(new BigDecimal(nowReport));
|
|
|
TaskGroup tgp = taskGroupService.getById(targetGpId);
|
|
|
//设置的数值大于0时检查是否超额
|
|
|
- if (tgp.getManDay() != null && tgp.getManDay() > 0) {
|
|
|
+ if (tgp != null && tgp.getManDay() != null && tgp.getManDay() > 0) {
|
|
|
multiply = new BigDecimal(tgp.getManDay()).multiply(new BigDecimal(comTimeType.getAllday()));
|
|
|
System.out.println("hasReport:"+hasReport+" multiply:"+multiply);
|
|
|
if (hasReport.doubleValue() > multiply.doubleValue()) {
|