From d51f04817f76705873e42a31bde803fe2399c180 Mon Sep 17 00:00:00 2001
From: qiankanghui <kanghui.qian@xujiesoft.com>
Date: Thu, 10 Sep 2026 14:13:32 +0800
Subject: [PATCH] =?UTF-8?q?refactor(grid):=20=E4=BC=98=E5=8C=96=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E7=94=A8=E6=88=B7=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加 HashSet 导入用于去重操作
- 将"整组替换"注释中的引号改为中文引号
- 实现按 columnProp 字段去重逻辑，防止历史重复数据传播
- 在去重后对数据进行排序并批量保存
---
 .../service/impl/GridTableUserServiceImpl.java    | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/heai/modules/grid/service/impl/GridTableUserServiceImpl.java b/src/main/java/com/heai/modules/grid/service/impl/GridTableUserServiceImpl.java
index e3358fb..4a4bd74 100644
--- a/src/main/java/com/heai/modules/grid/service/impl/GridTableUserServiceImpl.java
+++ b/src/main/java/com/heai/modules/grid/service/impl/GridTableUserServiceImpl.java
@@ -11,6 +11,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.Comparator;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -28,15 +29,21 @@ public class GridTableUserServiceImpl extends ServiceImpl<GridTableUserDao, Grid
             return;
         }
         GridTableUser first = gridTableUsers.get(0);
-        // 用"整组替换"代替逐行 update，减少锁竞争和死锁概率
+        // 用“整组替换”代替逐行 update，减少锁竞争和死锁概率
         lambdaUpdate()
                 .eq(GridTableUser::getUserId, first.getUserId())
                 .eq(GridTableUser::getFunctionId, first.getFunctionId())
                 .eq(GridTableUser::getTableId, first.getTableId())
                 .remove();
-
-        gridTableUsers.sort(Comparator.comparing(GridTableUser::getSortLv, Comparator.nullsLast(Integer::compareTo)));
-        this.saveBatch(gridTableUsers);
+    
+        // 按 columnProp 去重：防止 grid_table_default 历史重复行传播到 user 表
+        Set<String> seen = new HashSet<>();
+        List<GridTableUser> deduped = gridTableUsers.stream()
+                .filter(item -> seen.add(item.getColumnProp()))
+                .sorted(Comparator.comparing(GridTableUser::getSortLv, Comparator.nullsLast(Integer::compareTo)))
+                .collect(Collectors.toList());
+    
+        this.saveBatch(deduped);
     }