From 3a5a4c918cffc1836de16314abca051a1d61d763 Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期六, 29 八月 2026 10:26:16 +0800
Subject: [PATCH] 支持电池组列表展示共享字段

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBatteryGroupServiceImpl.java |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBatteryGroupServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBatteryGroupServiceImpl.java
index 1b62df7..9ca780c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBatteryGroupServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBatteryGroupServiceImpl.java
@@ -32,11 +32,20 @@
     @Autowired
     private TBatteryGroupMapper batteryGroupMapper;
 
-    /** 按查询条件返回未删除的电池组列表。 */
+    /** 按查询条件返回未删除的电池组列表,并附带共享字段值。 */
     @Override
     public List<TBatteryGroup> selectBatteryGroupList(TBatteryGroup group)
     {
-        return batteryGroupMapper.selectBatteryGroupList(group);
+        List<TBatteryGroup> groups = batteryGroupMapper.selectBatteryGroupList(group);
+        if (groups == null)
+        {
+            return List.of();
+        }
+        for (TBatteryGroup item : groups)
+        {
+            item.setTemplateFields(batteryGroupMapper.selectRelationFields(item.getGroupId()));
+        }
+        return groups;
     }
 
     /** 返回已有电池组的创建人选项。 */

--
Gitblit v1.7.1