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},
+            <if test="code != null and code !=''">
+                code = #{code},
+            </if>
             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<String> 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);