diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/StaffAgencyServiceImpl.java b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/StaffAgencyServiceImpl.java index c150e6baaa..ae7a56de8f 100644 --- a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/StaffAgencyServiceImpl.java +++ b/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().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<>(); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java index 44f14521b1..2eb0873cc8 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java +++ b/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 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()); diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java index 1f697182b0..c2163d560c 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java +++ b/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 getHomeDesignByCustomer(CustomerHomeFormDTO formDTO) { HomeDesignByCustomerResultDTO resultDTO = new HomeDesignByCustomerResultDTO(); //根据客户id,所属端获取客户首页配置的设计稿 - formDTO.setStatus(OperCustomizeConstant.STATUS_DRAFT); List list = customerHomeDetailDao.selectCustomerHomeDetail(formDTO); List titleList = new ArrayList<>(); List topList = new ArrayList<>();