From d226cbbc14d0168e775fadf9fbffa791a5764f2a Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 14 May 2020 20:36:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E9=85=8D=E7=BD=AE(/resi/guide/stranger/getgr?= =?UTF-8?q?idhome),=E6=94=BF=E5=BA=9C=E7=AB=AF(gov/mine/agency/getlatestgr?= =?UTF-8?q?id)=E6=8E=A5=E5=8F=A3bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/StaffAgencyServiceImpl.java | 4 +++- .../com/epmet/service/impl/CustomerStaffGridServiceImpl.java | 3 +++ .../src/main/java/com/epmet/service/impl/HomeServiceImpl.java | 1 - 3 files changed, 6 insertions(+), 2 deletions(-) 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<>();