From 31623a8562fe0e2d69e944e4e783de0f3eb2b3e7 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Tue, 27 Sep 2022 09:44:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87URL=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../item/service/impl/PushToCityGridServiceImpl.java       | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java
index 46433a663..5c30ac633 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java
@@ -38,6 +38,7 @@ import com.elink.esua.epdc.dto.item.ItemHandleProcessDTO;
 import com.elink.esua.epdc.dto.item.result.*;
 import com.elink.esua.epdc.enums.ItemGridPlatformHandleStatusEnum;
 import com.elink.esua.epdc.gird.city.api.CityGridApi;
+import com.elink.esua.epdc.gird.shibei.contants.ApiConstants;
 import com.elink.esua.epdc.modules.feign.AdminFeignClient;
 import com.elink.esua.epdc.modules.item.dao.ItemDao;
 import com.elink.esua.epdc.modules.item.dao.ItemGridPlatformDao;
@@ -657,7 +658,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
         for (String i : urlList) {
             url = i + "," + url;
         }
-        data.setClzp(url);
+        data.setClzp(url.replace(ApiConstants.eventOssUrlBefore, ApiConstants.eventOssUrlAfter));
         // 操作人
         AppealHandlingResultDTO.CzrDTO dto = new AppealHandlingResultDTO.CzrDTO();
         // 操作人姓名
@@ -1181,8 +1182,8 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
         AppealAuditResultDTO.CzrDTO czr = new AppealAuditResultDTO.CzrDTO();
         czr.setId(entity.getGridPartyid());
         czr.setXm(entity.getGridPartyname());
-        czr.setSsjgbm(getJgbm(Long.valueOf(entity.getGridUnitid()), NumConstant.ZERO_STR));
-        czr.setSsjg(getJgbm(Long.valueOf(entity.getGridUnitid()), NumConstant.ONE_STR));
+        czr.setSsjgbm(null == entity.getGridUnitid()?"":getJgbm(Long.valueOf(entity.getGridUnitid()), NumConstant.ZERO_STR));
+        czr.setSsjg(null == entity.getGridUnitid()?"":getJgbm(Long.valueOf(entity.getGridUnitid()), NumConstant.ONE_STR));
         czr.setSsbmbm(entity.getGridUnitid());
         czr.setSsbm(entity.getGridUnitname());
         dto.setCzr(czr);