From 138d5f087e386c657d964e4e4c2b8ac65038e085 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 01 二月 2021 14:47:06 +0800
Subject: [PATCH] 优化 考勤任务上报

---
 service-common/src/main/java/com/java110/common/smo/impl/MachineInnerServiceSMOImpl.java |    4 ++++
 1 files changed, 4 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
index df3ec17..c66913e 100644
--- 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;
@@ -71,6 +72,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