From ddfff05de2b18b7859df435572f382b54c620fea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Mon, 18 Sep 2023 11:28:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9OTA=E5=BE=85=E5=8A=9E?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DummyInventoryInfoEOServiceImpl.java        |  4 ++++
 .../service/impl/OtaManageApplyEOServiceImpl.java    | 12 +++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
index 486ba10c1..339a11252 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
@@ -2273,6 +2273,10 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 				value = pullMore(dictItemList, dummyInventoryInfoEO, errorMsg, dutyTerritory,msgList,"责任领域","Responsible Field","duty_territory");
 				if(StringUtils.isNotBlank(value)){
 					dummyInventoryInfoEO.setDutyTerritory(value);
+					List<String> list = Arrays.asList(value.split(","));
+					List<SysDictItem> ddList = dictItemList.stream().filter(e -> "duty_territory".equals(e.getDictCode()) && list.contains(e.getItemValue())).collect(Collectors.toList());
+					List<String> valueList = ddList.stream().map(SysDictItem::getStatNode).collect(Collectors.toList());
+					dummyInventoryInfoEO.setDutyDepart(StringUtils.join(valueList,","));
 				}
 			}
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
index c53bef149..4f48be03a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
@@ -216,12 +216,14 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
                 for (OtaManageReceiveNsdp omrn : valList) {
                     //找到最快来临的发布时间
                     try {
-                        Date syncDate = sdf.parse(omrn.getReleaseDate());
-                        if (null == releaseDate) {
-                            releaseDate = syncDate;
-                        } else {
-                            if (syncDate.after(today) && syncDate.before(releaseDate)) {
+                        if(StringUtils.isNotEmpty(omrn.getReleaseDate())){
+                            Date syncDate = sdf.parse(omrn.getReleaseDate());
+                            if (null == releaseDate) {
                                 releaseDate = syncDate;
+                            } else {
+                                if (syncDate.after(today) && syncDate.before(releaseDate)) {
+                                    releaseDate = syncDate;
+                                }
                             }
                         }
                     } catch (ParseException e) {