c-zhouhf1/zhgh_ncu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

费用报销管理-报销申请：当前年度未配置校工会经费时，余额返回 0(不再对空对象调用getTotalQuota());

Browse Source
This commit is contained in:
dd3s_206
2026-09-14 21:00:47 +08:00
parent 15d298c301
commit 77da090407
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/service/impl/OutlayReimburseApplyServiceImpl.java
+1 -1
View File
@@ -117,7 +117,7 @@ public class OutlayReimburseApplyServiceImpl extends BaseServiceImpl<OutlayReimb
if (outlayManageSource.equals("ACTIVITY_BUDGET_TYPE_ONE")) { if (outlayManageSource.equals("ACTIVITY_BUDGET_TYPE_ONE")) {
OutlayManageSchool school = dao().fetch(OutlayManageSchool.class, Cnd.where("year", "=", DateUtil.thisYear())); 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")) { } else if (outlayManageSource.equals("ACTIVITY_BUDGET_TYPE_TWO")) {
OutlayManageUnion union = dao().fetch(OutlayManageUnion.class, Cnd.where("year", "=", DateUtil.thisYear()) OutlayManageUnion union = dao().fetch(OutlayManageUnion.class, Cnd.where("year", "=", DateUtil.thisYear())
.and("unionId", "=", StrUtil.isNotBlank(unionId) ? unionId : SecurityUtil.getUnionId())); .and("unionId", "=", StrUtil.isNotBlank(unionId) ? unionId : SecurityUtil.getUnionId()));