From 2e6ca964470234d8aff78b0f2093cabbaac7d338 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Thu, 6 Jan 2022 17:53:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E6=A0=87=E8=AF=A6=E6=83=85=20=20?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=AD=97=E5=85=B8=E6=9F=A5=E8=AF=A2=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E6=97=B6,=E4=BD=BF=E7=94=A8=E5=85=B6=E6=9C=AC?=
 =?UTF-8?q?=E8=BA=AB=E6=95=B0=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SarBussionessStandServiceImpl.java    | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
index c68dc1d7..880511a5 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
@@ -282,7 +282,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
         if (null != page.getNowOrderBy()) {
             nowOrderFunc(page);
         }
-        
+
         List<SarBussionessStand> getList = sarBussionessStandEODao.getSarBussionessStand(page);
         attrInfoShowExport(getList);
         return getList;
@@ -825,7 +825,13 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                         value = entry.getValue().toString();
                         List<String> valArr = Arrays.asList(value.split(","));
                         value = dicTypeEODao.getDicNamesByCodes(valArr);
-                        entry.setValue(value);
+
+                        Optional.ofNullable(value)
+                                .ifPresent(val->{
+                                    entry.setValue(val);
+                                });
+
+
                     }
                 }
             }