code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/DailyReimbursSubOp.java

@@ -45,16 +45,14 @@ public class DailyReimbursSubOp extends AbstractOperationServicePlugIn {
                         String zcgj_invoiceremark = dataEntity.getString("zcgj_invoiceremark");//特殊说明
                         DynamicObjectCollection accountEntryCollection = dataEntity.getDynamicObjectCollection("accountentry");//收款信息
                         if (accountEntryCollection.size() > 0) {
-                            for (DynamicObject accountEntry : accountEntryCollection) {
+                            for (int i = 0; i < accountEntryCollection.size(); i++) {
+                                DynamicObject accountEntry = accountEntryCollection.get(i);
                                 String payerType = accountEntry.getString("payertype");//收款人类型
                                 if (payerType.equals("er_payeer")) {
                                     DynamicObject payer = accountEntry.getDynamicObject("payer");//收款人(个人
                                     if (payer != null && applier != null) {
                                         String applierNumber = applier.getString("number");//申请人编号
-                                        DynamicObject payer1 = payer.getDynamicObject("payer");//收款人（个人-收款人
+                                        DynamicObject payer1 = payer.getDynamicObject("payer");
-                                        if (payer1 == null) {
-                                            return;
-                                        }
                                         String payer1Number = payer1.getString("number");//收款人编号
                                         if (!applierNumber.equals(payer1Number) && "".equals(zcgj_invoiceremark)) {
                                             //申请人和收款人不一致

code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/utils/OrgCheckUtils.java

@@ -34,12 +34,6 @@ public  class  OrgCheckUtils {
      * 判断是否为矿山
      */
     public static boolean isKS(Long currentOrgId){
-        QFilter costCompanyId = new QFilter("zcgj_costcompany.id", QCP.equals,currentOrgId);
-        DynamicObject zcgj_minecompany = BusinessDataServiceHelper.loadSingle("zcgj_minecompany",
-                "id", new QFilter[]{costCompanyId});//基础资料（矿山公司）
-        if(zcgj_minecompany != null){
-            return true;
-        }
         QFilter filterOrgId = new QFilter("number", QCP.equals,ksNumberTop);//中材矿山建设有限公司
         DynamicObject adminOrg = BusinessDataServiceHelper.loadSingle("bos_org", "number,name,fullname", new QFilter[]{filterOrgId});
         long orgId = adminOrg.getLong("id");