From 26e45ddbc526646125fa0167d8cb5cc1e881ca10 Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Thu, 5 Sep 2024 10:55:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java index 06b3519..7f10233 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java @@ -750,7 +750,7 @@ public class CsGroupServiceImpl extends ServiceImpl impl for (DataGroupTemplateVO dataGroupTemplate : dataGroupTemplates) { EnergyTemplateVO energyTemplate = energyTemplateMap.get(dataGroupTemplate.getId()); if (energyTemplate != null && energyTemplate.getUnit() != null) { - if (changePower(dataGroupTemplate.getName()) && Objects.equals(type,"Primary")) { + if (changePower(dataGroupTemplate.getName())) { dataGroupTemplate.setName(dataGroupTemplate.getName() + "(k" + energyTemplate.getUnit() + ")"); } else { dataGroupTemplate.setName(dataGroupTemplate.getName() + "(" + energyTemplate.getUnit() + ")");