Merge branch 'dev_mysql_chase' into 'dev_mysql'

修复tbm调整表计算bug

See merge request root/atms!375

atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/TBM.java

@@ -137,10 +137,8 @@ public class TBM extends FunctionBase implements FreeRefFunction {
             c1.andOrganizationIdEqualTo(organization.getId());
         }
         List<AdjustmentTable> list = SpringContextUtil.adjustmentTableMapper.selectByExample(glBalanceExample);
-        if (CollectionUtils.isEmpty(list)) {
-            return 0.0;
-        }
         BigDecimal amount = new BigDecimal(0);
+        if (CollectionUtils.isNotEmpty(list)) {
             //计算本期发生
             for (AdjustmentTable balance : list) {
                 ReportCellDataSourceDto dto = new ReportCellDataSourceDto();
@@ -164,6 +162,7 @@ public class TBM extends FunctionBase implements FreeRefFunction {
                 dto.setType(FormulaDataSourceType.TrialBalanceSource.getCode());
                 contain.add(dto);
             }
+        }
         //计算往期发生
         glBalanceExample = new AdjustmentTableExample();
         c1 = glBalanceExample.createCriteria().andSegment3In(segment3List)