소스 검색

Merge branch 'test' into dev

yzc 1 년 전
부모
커밋
14a38b59dd
1개의 변경된 파일3개의 추가작업 그리고 1개의 파일을 삭제
  1. 3 1
      hx-account/src/main/java/com/fjhx/account/service/write/impl/WriteOffRecordsServiceImpl.java

+ 3 - 1
hx-account/src/main/java/com/fjhx/account/service/write/impl/WriteOffRecordsServiceImpl.java

@@ -109,7 +109,9 @@ public class WriteOffRecordsServiceImpl extends ServiceImpl<WriteOffRecordsMappe
             AccountRunningWater accountRunningWater = accountRunningWaterService.getOne(q -> q.eq(AccountRunningWater::getBusinessId, accountPayment.getId()));
             Assert.notEmpty(accountRunningWater, "查询不到打款流水信息");
             //删除往来信息
-            if (accountRunningWater.getIsTransaction() == 1) {
+            Integer isTransaction = accountRunningWater.getIsTransaction();
+            isTransaction = ObjectUtil.isEmpty(isTransaction) ? 0 : isTransaction;
+            if (1 == isTransaction) {
                 TaxRefundDetails taxRefundDetails = taxRefundDetailsService.getOne(q -> q.eq(TaxRefundDetails::getAccountRunningWaterId, accountRunningWater.getId()));
                 if (ObjectUtil.isNotEmpty(taxRefundDetails)) {
                     taxRefundDetailsService.removeById(taxRefundDetails.getId());