From c7319e0fc1df9b694fd48cc32eb4033eb103a649 Mon Sep 17 00:00:00 2001
From: jinbooks_dev <help@jinbooks.com>
Date: Wed, 11 Jun 2025 19:25:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E4=BA=A7=E8=B4=9F=E5=80=BA=E8=A1=A8?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/statement/balance-sheet.vue     | 22 +++++++++----------
 ...tatementBalanceSheetConfigServiceImpl.java |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/jinbooks-ui/src/views/statement/balance-sheet.vue b/jinbooks-ui/src/views/statement/balance-sheet.vue
index 9cbd965..ad7010e 100644
--- a/jinbooks-ui/src/views/statement/balance-sheet.vue
+++ b/jinbooks-ui/src/views/statement/balance-sheet.vue
@@ -99,16 +99,16 @@
             </template>
           </el-table-column>
           <el-table-column label="行次" align="center" prop="sortIndex" width="100"/>
-          <el-table-column label="年初余额" align="right" header-align="center" width="140" prop="initialBalance">
-            <template #default="scope">
-              {{ formatAmount(scope.row.initialBalance, '') }}
-            </template>
-          </el-table-column>
           <el-table-column label="期末余额" align="right" header-align="center" width="140" prop="currentBalance">
             <template #default="scope">
               {{ formatAmount(scope.row.currentBalance, '') }}
             </template>
           </el-table-column>
+          <el-table-column label="年初余额" align="right" header-align="center" width="140" prop="initialBalance">
+            <template #default="scope">
+              {{ formatAmount(scope.row.initialBalance, '') }}
+            </template>
+          </el-table-column>
           <el-table-column v-if="ableEdit" label="操作" align="center" width="100">
             <template #default="scope">
               <div v-if="scope.row.itemName !='' ">
@@ -128,18 +128,18 @@
             </template>
           </el-table-column>
           <el-table-column label="行次" align="center" width="100" prop="liabilitySortIndex"/>
+           <el-table-column label="期末余额" align="right" header-align="center" width="140"
+                           prop="liabilityCurrentBalance">
+            <template #default="scope">
+              {{ formatAmount(scope.row.liabilityCurrentBalance, '') }}
+            </template>
+          </el-table-column>
           <el-table-column label="年初余额" align="right" header-align="center" width="140"
                            prop="liabilityInitialBalance">
             <template #default="scope">
               {{ formatAmount(scope.row.liabilityInitialBalance, '') }}
             </template>
           </el-table-column>
-          <el-table-column label="期末余额" align="right" header-align="center" width="140"
-                           prop="liabilityCurrentBalance">
-            <template #default="scope">
-              {{ formatAmount(scope.row.liabilityCurrentBalance, '') }}
-            </template>
-          </el-table-column>
 
           <el-table-column v-if="ableEdit" label="操作" align="center" width="100">
             <template #default="scope">
diff --git a/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/StatementBalanceSheetConfigServiceImpl.java b/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/StatementBalanceSheetConfigServiceImpl.java
index 492b840..622adad 100644
--- a/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/StatementBalanceSheetConfigServiceImpl.java
+++ b/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/StatementBalanceSheetConfigServiceImpl.java
@@ -135,7 +135,7 @@ public class StatementBalanceSheetConfigServiceImpl implements StatementBalanceS
 //        updateSortIndex(dto, StatementSymbolEnum.PLUS);
         statementBalanceSheetItemMapper.updateById(dto);
         // 规则更新
-        if (dto.getRules() != null && !dto.getRules().isEmpty()) {
+        if (dto.getRules() != null) {
             for (StatementRules rule : dto.getRules()) {
                 rule.setItemCode(dto.getItemCode());
                 rule.setBookId(dto.getBookId());