居民端获取首页配置(/resi/guide/stranger/getgridhome),政府端(gov/mine/agency/getlatestgrid)接口bug修改

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

@@ -215,7 +215,9 @@ public class StaffAgencyServiceImpl implements StaffAgencyService {
                 return staffGridResult;
             }
         }
-        return new Result<CustomerGridByUserIdResultDTO>().error(StaffAgencyConstant.QUERY_LATEST_GRID_INFO_FAILED);
+        logger.error(String.format("客户id%s,staffId%s查询最后一次登录网格为空",latestGridFormDTO.getCustomerId(),latestGridFormDTO.getStaffId()));
+        //.error(StaffAgencyConstant.QUERY_LATEST_GRID_INFO_FAILED)
+        return new Result<>();
     }
 
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java

@@ -119,6 +119,9 @@ public class CustomerStaffGridServiceImpl extends BaseServiceImpl<CustomerStaffG
     @Override
     public Result<CustomerGridByUserIdResultDTO> getStaffGridOrderByGridName(LatestGridFormDTO latestGridFormDTO) {
         CustomerGridDTO grid = baseDao.selectStaffGridOrderByGridName(latestGridFormDTO);
+        if(null==grid){
+            return new Result<>();
+        }
         CustomerGridByUserIdResultDTO result = new CustomerGridByUserIdResultDTO();
         result.setGridName(grid.getGridName());
         result.setGridId(grid.getId());

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java

@@ -53,7 +53,6 @@ public class HomeServiceImpl implements HomeService {
 	public Result<HomeDesignByCustomerResultDTO> getHomeDesignByCustomer(CustomerHomeFormDTO formDTO) {
 		HomeDesignByCustomerResultDTO resultDTO = new HomeDesignByCustomerResultDTO();
 		//根据客户id,所属端获取客户首页配置的设计稿
-		formDTO.setStatus(OperCustomizeConstant.STATUS_DRAFT);
 		List<CommonComponentDesignResultDTO> list = customerHomeDetailDao.selectCustomerHomeDetail(formDTO);
 		List<CommonComponentDesignResultDTO> titleList = new ArrayList<>();
 		List<CommonComponentDesignResultDTO> topList = new ArrayList<>();