diff --git a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/DailyLoanBillSubValidatorOp.java b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/DailyLoanBillSubValidatorOp.java index ceb9f9f..9f62754 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/DailyLoanBillSubValidatorOp.java +++ b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/DailyLoanBillSubValidatorOp.java @@ -86,18 +86,23 @@ public class DailyLoanBillSubValidatorOp extends AbstractOperationServicePlugIn QFilter filter = new QFilter("zcgj_entryentity.zcgj_person", QCP.equals, applier.getPkValue());//可借款人员 filter.and(new QFilter("zcgj_currentyear", QCP.equals, bizDateYear));//申请日期年份 DynamicObject quotaImprestLedger = BusinessDataServiceHelper.loadSingle("zcgj_quotaimprestledger", - "id",new QFilter[]{filter});//定额备用金初始台账 + "id", new QFilter[]{filter});//定额备用金初始台账 if (quotaImprestLedger != null) { this.addFatalErrorMessage(dataEnt, "您在定额备用金初始化台账里,所以不能使用临时备用金!!"); return; } - }/* else if (impRestType.equals("2")) { + } else if (impRestType.equals("2")) { //项目筹备备用金 QFilter filter = new QFilter("zcgj_entryentity.zcgj_person", QCP.equals, applier.getPkValue());// 可借款人员 filter.and(new QFilter("zcgj_entryentity.zcgj_isenabled", QCP.equals, true));// 启用 filter.and(new QFilter("zcgj_entryentity.zcgj_company", QCP.equals, companyId));// 公司 - DynamicObject projectReserveFund = BusinessDataServiceHelper.loadSingle("zcgj_projectreservefund", new QFilter[]{filter});//项目筹备备用金公司 - }*/ + DynamicObject projectReserveFund = BusinessDataServiceHelper.loadSingle("zcgj_projectreservefund", + "id", new QFilter[]{filter});//项目筹备备用金公司 + if (projectReserveFund == null) { + this.addFatalErrorMessage(dataEnt, "您未在项目筹备备用金公司里,所以不能使用项目筹备备用金!!"); + return; + } + } } } }