费用报销管理-报销申请:当前年度未配置校工会经费时,余额返回 0(不再对空对象调用getTotalQuota());
This commit is contained in:
+1
-1
@@ -117,7 +117,7 @@ public class OutlayReimburseApplyServiceImpl extends BaseServiceImpl<OutlayReimb
|
||||
|
||||
if (outlayManageSource.equals("ACTIVITY_BUDGET_TYPE_ONE")) {
|
||||
OutlayManageSchool school = dao().fetch(OutlayManageSchool.class, Cnd.where("year", "=", DateUtil.thisYear()));
|
||||
map.put("budgetMoney", school.getTotalQuota().subtract(school.getUsedQuota()));
|
||||
map.put("budgetMoney", ObjectUtil.isNotEmpty(school) ? school.getTotalQuota().subtract(school.getUsedQuota()) : 0);
|
||||
} else if (outlayManageSource.equals("ACTIVITY_BUDGET_TYPE_TWO")) {
|
||||
OutlayManageUnion union = dao().fetch(OutlayManageUnion.class, Cnd.where("year", "=", DateUtil.thisYear())
|
||||
.and("unionId", "=", StrUtil.isNotBlank(unionId) ? unionId : SecurityUtil.getUnionId()));
|
||||
|
||||
Reference in New Issue
Block a user