diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java index 8efe76b..e4d85d1 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java @@ -91,9 +91,9 @@ @Override public Object list(Page page,VisitorApplyListRequest visitorApplyListRequest, HttpServletRequest request) { JSONObject jsonObject = userActionService.getLoginStatus(request); -// if(null == jsonObject){ -// return ResponseData.error(2401,Status.TOKEN_EXPIRES); -// } + if(null == jsonObject){ + return ResponseData.error(2401,Status.TOKEN_EXPIRES); + } Page visitorApplyPage = visitorApplyMapper.selectApplyList(page,visitorApplyListRequest); if(CollectionUtils.isEmpty(visitorApplyPage.getRecords())){ return ResponseData.success(new ArrayList<>()); @@ -152,11 +152,10 @@ public Object getMessageList(Page> page,HttpServletRequest request) { try { JSONObject jsonObject = userActionService.getLoginStatus(request); -// if(null == jsonObject){ -// return ResponseData.error(2401,Status.TOKEN_EXPIRES); -// } - //String openid = jsonObject.get("openid").toString(); - String openid = "oqiuy5D3K1wYeFpGN5I-B9aoscYA"; + if(null == jsonObject){ + return ResponseData.error(2401,Status.TOKEN_EXPIRES); + } + String openid = jsonObject.get("openid").toString(); Page> resMap = visitorApplyMapper.getMessageList(page,openid); for (HashMap map : resMap.getRecords()){ map.put("apply_time",map.get("in_time").toString()+"-"+map.get("out_time").toString());