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() + ")");