From 3fe2aea7827eafc7513159db9a337fdf567584c8 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期一, 08 五月 2023 01:21:13 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-common/src/main/java/com/java110/common/smo/impl/MachineInnerServiceSMOImpl.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/smo/impl/MachineInnerServiceSMOImpl.java b/service-common/src/main/java/com/java110/common/smo/impl/MachineInnerServiceSMOImpl.java
old mode 100644
new mode 100755
index df3ec17..9a844cd
--- a/service-common/src/main/java/com/java110/common/smo/impl/MachineInnerServiceSMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/smo/impl/MachineInnerServiceSMOImpl.java
@@ -12,6 +12,7 @@
import com.java110.intf.common.IMachineInnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
@@ -64,6 +65,7 @@
MachineAttrDto machineAttrDto = new MachineAttrDto();
machineAttrDto.setMachineIds(machineIds.toArray(new String[machineIds.size()]));
machineAttrDto.setCommunityId(machines.get(0).getCommunityId());
+ machineAttrDto.setDomain(machineDto.getDomain());
List<MachineAttrDto> machineAttrDtos = machineAttrInnerServiceSMOImpl.queryMachineAttrs(machineAttrDto);
List<MachineAttrDto> tMachineAttrDtos = null;
@@ -71,6 +73,9 @@
tMachineAttrDtos = new ArrayList<>();
for (MachineAttrDto tMachineAttrDto : machineAttrDtos) {
+ if (StringUtil.isEmpty(tMachineAttrDto.getValueName())) {
+ tMachineAttrDto.setValueName(tMachineAttrDto.getValue());
+ }
if (tMachineDto.getMachineId().equals(tMachineAttrDto.getMachineId())) {
tMachineAttrDtos.add(tMachineAttrDto);
}
--
Gitblit v1.8.0