/grid/griddetail避免空指针

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;
     }

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);