Merge branch 'dev_journal' into dev

epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/StaffAgencyServiceImpl.java

@@ -17,6 +17,7 @@
 
 package com.epmet.service.impl;
 
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -67,8 +68,10 @@ public class StaffAgencyServiceImpl implements StaffAgencyService {
     public List<StaffGridResultDTO> getMyGrids(String staffId) {
         //1、获取拥有的所有网格
         Result<List<CustomerGridByUserIdResultDTO>> govOrgResult = govOrgFeignClient.getMyGrids(staffId);
-        if (!govOrgResult.success() || (null == govOrgResult.getData() || govOrgResult.getData().size() < 1)) {
+        if (!govOrgResult.success()) {
-            logger.error(String.format("调用gov-org-server服务查询工作人员网格列表失败返回结果", govOrgResult.toString()));
+            throw new RenException(String.format("调用gov-org-server服务查询工作人员网格列表失败,返回结果:", govOrgResult.toString()));
+        }
+        if (null == govOrgResult.getData() || govOrgResult.getData().size() < 1) {
             return new ArrayList<>();
         }
         List<StaffGridResultDTO> gridList = ConvertUtils.sourceToTarget(govOrgResult.getData(), StaffGridResultDTO.class);