From aed1d0a9c48bf282cee8e84101d8585ed02073da Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 22 Jul 2022 19:43:48 +0800
Subject: [PATCH] editgrid
---
.../src/main/resources/mapper/CustomerGridDao.xml | 4 +++-
.../opendata/mq/listener/OpenDataOrgChangeEventListener.java | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
index bd6f04bbc8..c3d15d75e0 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
@@ -240,7 +240,9 @@
set
grid_name = #{gridName},
manage_district = #{manageDistrict},
- code = #{code},
+
+ code = #{code},
+
grid_type = #{gridType},
contacts = #{contacts},
mobile = #{mobile},
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataOrgChangeEventListener.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataOrgChangeEventListener.java
index 02fc563a78..deb7384c61 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataOrgChangeEventListener.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataOrgChangeEventListener.java
@@ -95,7 +95,9 @@ public class OpenDataOrgChangeEventListener implements MessageListenerConcurrent
extractFormDto.setCustomerId(obj.getCustomerId());
extractFormDto.setType(obj.getType());
List orgIdList = new ArrayList<>();
- orgIdList.add(obj.getOrgId());
+ if(StringUtils.isNotBlank(obj.getOrgId())){
+ orgIdList.add(obj.getOrgId());
+ }
extractFormDto.setOrgIdList(orgIdList);
if ("agency".equals(obj.getOrgType())) {
SpringContextUtils.getBean(GridInfoPingyinService.class).exractAgency(extractFormDto);