diff --git a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/DailyReimburseAccountPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/DailyReimburseAccountPlugin.java index 0fcac7b..36a3526 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/DailyReimburseAccountPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/DailyReimburseAccountPlugin.java @@ -93,13 +93,17 @@ public class DailyReimburseAccountPlugin extends AbstractBillPlugIn implements P } QFilter filter3 = new QFilter("entryentity.orgid", QCP.equals, costCompanyId); - DynamicObjectCollection wf_orgTyp = QueryServiceHelper.query("wf_orgtype", + DynamicObjectCollection wf_orgTypCollection = QueryServiceHelper.query("wf_orgtype", "number", new QFilter[]{filter3});//组织分类 - if (wf_orgTyp != null && wf_orgTyp.size() == 1) { - String wf_orgTypeNumber = (String) wf_orgTyp.get(0).get("number");//组织分类编号 + if (wf_orgTypCollection != null && wf_orgTypCollection.size() > 0) { + List numbers = new ArrayList<>(); + for (DynamicObject wf_orgTyp : wf_orgTypCollection) { + String number = wf_orgTyp.getString("number"); + numbers.add(number); + } DynamicObject orgCateGoryConfig = BusinessDataServiceHelper.loadSingle("zcgj_orgcategoryconfig", - new QFilter("number", QCP.equals, wf_orgTypeNumber).toArray());//组织分类配置表 + new QFilter("number", QCP.in, numbers).toArray());//组织分类配置表 String accountType = null;//默认科目分类中的科目分类 if (orgCateGoryConfig != null) { @@ -154,7 +158,7 @@ public class DailyReimburseAccountPlugin extends AbstractBillPlugIn implements P if (name.equals("expenseitem")) { //费用项目 DynamicObject zcgj_accountfee = BusinessDataServiceHelper.loadSingle("zcgj_accountfee", - new QFilter("zcgj_biztype", QCP.equals, "10").toArray());//费用与科目分类表 + new QFilter("zcgj_biztype", QCP.equals, "30").toArray());//费用与科目分类表 List feeNumbers = new ArrayList<>(); if (zcgj_accountfee != null) { DynamicObjectCollection entryEntityCollection = zcgj_accountfee.getDynamicObjectCollection("zcgj_entryentity");//分录