From 2b72be7962e44d251fdecc8fdc6465ed7237536e Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期一, 02 十二月 2024 10:25:08 +0800 Subject: [PATCH] 最新版本541200007 --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java index f423fd2..09ac819 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java @@ -1661,25 +1661,28 @@ pcWorkPlatformDataVO.setLwList(lwList ); }else if(Constants.equalsInteger(queryType,Constants.THREE)) { - MPJLambdaWrapper<Notices> queryWrapper = new MPJLambdaWrapper<>(); - queryWrapper.selectAll(Notices.class); if (Objects.isNull(loginUserInfo.getMemberId())) { - queryWrapper.eq("1", "2"); + pcWorkPlatformDataVO.setNoticesList(new ArrayList<>()); + pcWorkPlatformDataVO.setNoticesNum(0); +// queryWrapper.eq("1", "2"); } else { + MPJLambdaWrapper<Notices> queryWrapper = new MPJLambdaWrapper<>(); + queryWrapper.selectAll(Notices.class); queryWrapper.eq(Notices::getStatus, Constants.ZERO); queryWrapper.eq(Notices::getSendacopy, Constants.ZERO); queryWrapper.eq(Notices::getParam2, Constants.ZERO); queryWrapper.eq(Notices::getUserId, loginUserInfo.getMemberId()); - } - queryWrapper.orderByDesc(Notices::getCreateDate); - List<Notices> noticesList = noticesJoinMapper.selectList(queryWrapper); - pcWorkPlatformDataVO.setNoticesList(noticesList); - pcWorkPlatformDataVO.setNoticesNum(noticesList.size()); - if(noticesList.size() > 5 ){ - pcWorkPlatformDataVO.setNoticesList(noticesList.subList(0,5)); - }else{ + queryWrapper.orderByDesc(Notices::getCreateDate); + List<Notices> noticesList = noticesJoinMapper.selectList(queryWrapper); pcWorkPlatformDataVO.setNoticesList(noticesList); + pcWorkPlatformDataVO.setNoticesNum(noticesList.size()); + if(noticesList.size() > 5 ){ + pcWorkPlatformDataVO.setNoticesList(noticesList.subList(0,5)); + }else{ + pcWorkPlatformDataVO.setNoticesList(noticesList); + } } + }else{ String code= systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.TIMEOUT_WARNING).getCode(); MPJLambdaWrapper<Visits> queryWrapper = new MPJLambdaWrapper<>(); -- Gitblit v1.9.3