From c182d0f3a5afd5b771c2b7f07cc105fcffcbe1a1 Mon Sep 17 00:00:00 2001 From: x_z Date: Fri, 6 Jan 2023 11:57:22 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E5=85=BB=E6=8A=A4?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=89=93=E5=8D=B0=E6=95=B0=E6=8D=AEnull?= =?UTF-8?q?=E5=80=BC=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventory/impl/DeviceMAOrderServiceImpl.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderServiceImpl.java index 749db94a..3fc12eae 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderServiceImpl.java @@ -26,10 +26,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; @Slf4j @Service @@ -186,15 +183,15 @@ public class DeviceMAOrderServiceImpl implements DeviceMAOrderService { String productName = udiInfoDao.selectProductNameByProductId(deviceMAOrderDetailEntity.getProductId()); data.put("productName", productName); //批次号 - data.put("batchNo", deviceMAOrderDetailEntity.getBatchNo()); + data.put("batchNo", StrUtil.isBlank(deviceMAOrderDetailEntity.getBatchNo()) ? "" : deviceMAOrderDetailEntity.getBatchNo()); //养护时间 data.put("createTime", deviceMAOrderEntity.getCreateTime()); //养护人 data.put("createUser", deviceMAOrderEntity.getCreateUser()); //审核人 - data.put("auditUser", deviceMAOrderEntity.getAuditUser()); + data.put("auditUser", StrUtil.isBlank(deviceMAOrderEntity.getAuditUser()) ? "" : deviceMAOrderEntity.getAuditUser()); //养护说明 - data.put("remark", deviceMAOrderDetailEntity.getRemark()); + data.put("remark", StrUtil.isBlank(deviceMAOrderDetailEntity.getRemark()) ? "" : deviceMAOrderDetailEntity.getRemark()); //设备状态 data.put("deviceStatus", deviceMAOrderDetailEntity.getDeviceStatus() == 0 ? "异常" : "正常"); //养护状态 From 77dccc047c921753d1f7b7fb2978a79c6e386e0b Mon Sep 17 00:00:00 2001 From: x_z Date: Fri, 6 Jan 2023 17:39:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E8=80=97=E6=9D=90?= =?UTF-8?q?=E5=AD=97=E5=85=B8=E6=9F=A5=E8=AF=A2=E8=AF=AD=E5=8F=A5=EF=BC=8C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=B3=E8=81=94=E8=A1=A8id=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml index a90f2604..a4c5a845 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml @@ -54,6 +54,7 @@ basic_products.basicPrductRemak6, basic_products.basicPrductRemak7, basic_products.basicPrductRemak8, + basic_udirel.id relId, basic_udirel.thirdId, basic_udirel.thirdName, basic_udirel.isUseDy,