From d66ac9226ce74b87f4c81362026d9bf91708e8af Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 13 Jan 2023 14:19:43 +0800
Subject: [PATCH] =?UTF-8?q?/grid/griddetail=E9=81=BF=E5=85=8D=E7=A9=BA?=
 =?UTF-8?q?=E6=8C=87=E9=92=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/controller/GridController.java     | 2 +-
 .../java/com/epmet/service/impl/CustomerGridServiceImpl.java   | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java
index 878200dc01..0e5c5ffccb 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java
@@ -43,7 +43,7 @@ public class GridController {
      * @return
      */
     @PostMapping("griddetail")
-    public Result<GridDetailResultDTO> gridDetail(@LoginUser TokenDto tokenDto,@RequestBody CustomerGridFormDTO customerGridFormDTO){
+    public Result<GridDetailResultDTO> gridDetail(@RequestBody CustomerGridFormDTO customerGridFormDTO){
         Result<GridDetailResultDTO> griddetail = customerGridService.griddetail(customerGridFormDTO);
         return griddetail;
     }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
index df84bed116..cbcce699ac 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
@@ -238,6 +238,9 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
     @Override
     public Result<GridDetailResultDTO> griddetail(CustomerGridFormDTO customerGridFormDTO) {
         GridDetailResultDTO griddetail = baseDao.griddetail(customerGridFormDTO);
+        if(null==griddetail){
+            return new Result<>();
+        }
         List<UserIdAndPidDTO> customerStaffGridDTOS = baseDao.selectUserIdByGridId(customerGridFormDTO);
         //获取人员具体信息(头像、名字...)
         Result<List<StaffGridListDTO>> staffGridList = epmetUserFeignClient.getStaffGridList(customerStaffGridDTOS);