From 90181f8df1645bd751d690be90c0d7534c641697 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Thu, 13 Apr 2023 11:11:29 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E8=B5=84=E7=94=B3=E8=AF=B7=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E8=80=97=E6=9D=90=E5=A4=87=E6=B3=A8=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/api/res/thrsys/UdiInfoResponse.java  |  1 +
 .../impl/ThrProductsAddDiServiceImpl.java     | 24 +++++++++++++------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java b/src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java
index e7a3dc27..cf666732 100644
--- a/src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java
+++ b/src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java
@@ -85,6 +85,7 @@ public class UdiInfoResponse {
     private String basicPrductRemak6;
     private String basicPrductRemak7;
     private String basicPrductRemak8;
+    private String remark;
 
     public Integer getId() {
         return id;
diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiServiceImpl.java
index 4928d49f..6afe1238 100644
--- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiServiceImpl.java
@@ -133,13 +133,23 @@ public class ThrProductsAddDiServiceImpl implements ThrProductsAddDiService {
     public UdiInfoResponse getDiProductDetail(String uuid) {
         ThrProductsAddDiEntity thrProductsAddDiEntity = thrProductsAddDiDao.filterThrProductsGetUuid(uuid);
         UdiInfoResponse udiInfoResponse = thrProductsAddDiDao.getDiProductDetail(uuid);
-        udiInfoResponse.setSptm(thrProductsAddDiEntity.getSptm());
-        udiInfoResponse.setYbbm(thrProductsAddDiEntity.getYbbm());
-        udiInfoResponse.setManufactory(thrProductsAddDiEntity.getManufactory());
-        udiInfoResponse.setCpms(thrProductsAddDiEntity.getCpms());
-        udiInfoResponse.setMeasname(thrProductsAddDiEntity.getMeasname());
-        udiInfoResponse.setManufactory(thrProductsAddDiEntity.getManufactory());
-        udiInfoResponse.setPrice(thrProductsAddDiEntity.getPrice());
+        if(udiInfoResponse!=null){
+            udiInfoResponse.setSptm(thrProductsAddDiEntity.getSptm());
+            udiInfoResponse.setYbbm(thrProductsAddDiEntity.getYbbm());
+            udiInfoResponse.setManufactory(thrProductsAddDiEntity.getManufactory());
+            udiInfoResponse.setCpms(thrProductsAddDiEntity.getCpms());
+            udiInfoResponse.setMeasname(thrProductsAddDiEntity.getMeasname());
+            udiInfoResponse.setManufactory(thrProductsAddDiEntity.getManufactory());
+            udiInfoResponse.setPrice(thrProductsAddDiEntity.getPrice());
+            udiInfoResponse.setBasicPrductRemak1(thrProductsAddDiEntity.getBasicPrductRemak1());
+            udiInfoResponse.setBasicPrductRemak2(thrProductsAddDiEntity.getBasicPrductRemak2());
+            udiInfoResponse.setBasicPrductRemak3(thrProductsAddDiEntity.getBasicPrductRemak3());
+            udiInfoResponse.setBasicPrductRemak4(thrProductsAddDiEntity.getBasicPrductRemak4());
+            udiInfoResponse.setBasicPrductRemak5(thrProductsAddDiEntity.getBasicPrductRemak5());
+            udiInfoResponse.setBasicPrductRemak6(thrProductsAddDiEntity.getBasicPrductRemak6());
+            udiInfoResponse.setBasicPrductRemak7(thrProductsAddDiEntity.getBasicPrductRemak7());
+            udiInfoResponse.setBasicPrductRemak8(thrProductsAddDiEntity.getBasicPrductRemak8());
+        }
         return udiInfoResponse;
     }