1. 平台导入添加错误并结算

src/main/java/com/ydtech/modules/fnc/service/impl/InsPlyIncomeServiceImpl.java

@@ -839,12 +839,10 @@ handlingProportion,
                     if (insPlyIncome.getOtherFeevalue() != null && insPlyIncome.getOtherFeevalue().compareTo(BigDecimal.ZERO) != 0) {
                         totalOtherAmount = totalOtherAmount.add(insPlyIncome.getOtherFeevalue());   //总跟单费
                     }
-                    if(StringUtils.isNotEmpty(reason)){
                         insPlyIncome.setSettlementUserId(BaseController.getUser().getId());
                         insPlyIncome.setSettlementTime(now);
                         insPlyIncome.setHandlingFeesStatus("1");
                         baseMapper.updateById(insPlyIncome);
-                    }
                     //判断是否是相同保司机构
                     partnerCompaniesIdSet.add(insPlyIncome.getPartnerCompaniesId());
                     objectObjectHashMap.put("reason",reason);
@@ -854,7 +852,7 @@ handlingProportion,
                     resultNoSelect.add(objectObjectHashMap);  // 添加未匹配的车牌号
                 }
             }
-            if(partnerCompaniesIdSet.size()>0){
+            if(partnerCompaniesIdSet.size()>1){
                 throw new SystemException("表里有不同保司机构");
             }
             resultHashMap.put("totalAmount", totalAmount);