From 711da11747135d8616d3d621ba2f080af9406873 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 5 Nov 2020 09:30:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/service/impl/OpenUpServiceImpl.java   | 4 ++--
 .../com/epmet/service/impl/CustomerAgencyServiceImpl.java     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/service/impl/OpenUpServiceImpl.java b/epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/service/impl/OpenUpServiceImpl.java
index 8c497a9c69..170c3e32c4 100644
--- a/epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/service/impl/OpenUpServiceImpl.java
+++ b/epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/service/impl/OpenUpServiceImpl.java
@@ -129,7 +129,7 @@ public class OpenUpServiceImpl implements OpenUpService {
     public AgencyInfoResultDTO agencyInfo(AgencyInfoFormDTO formDTO) {
         Result<AgencyInfoResultDTO> result = govOrgOpenFeignClient.agencyInfo(formDTO);
         if (!result.success()){
-            throw new RenException(ModuleConstant.ERROR_AGENCY);
+            throw new RenException(result.getInternalMsg());
         }
         return result.getData();
     }
@@ -142,7 +142,7 @@ public class OpenUpServiceImpl implements OpenUpService {
     public OrganizeTreeResultDTO organizeTree(OrganizeTreeFormDTO formDTO) {
         Result<OrganizeTreeResultDTO> result = govOrgOpenFeignClient.organizeTree(formDTO.getAgencyId());
         if (!result.success()){
-            throw new RenException(ModuleConstant.ERROR_AGENCY);
+            throw new RenException(result.getInternalMsg());
         }
         return result.getData();
     }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
index e02cb72ddc..dd3360a781 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
@@ -1007,7 +1007,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
             CustomerGridEntity gridEntity = customerGridDao.selectById(formDTO.getOrgId());
             if(null == gridEntity){
                 logger.error(String.format("根据网格Id未查询到网格数据，网格Id：%s", formDTO.getOrgId()));
-                throw new RenException("获取网格数据失败");
+                throw new RenException("获取网格数据失败,根据网格Id未查询到网格数据");
             }
             agencyId = gridEntity.getPid();
         }