From a349603453cd65a7f7d0f0a39e07c93a824471cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Sat, 1 Feb 2020 17:23:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=20=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=89=80=E5=B1=9E=E6=9C=BA=E6=9E=84=E6=9F=A5=E8=AF=A2=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/service/impl/NoticeServiceImpl.java | 2 ++ .../epdc-news-server/src/main/resources/mapper/NoticeDao.xml | 3 +++ 2 files changed, 5 insertions(+) diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java index bbc391b1b..f4775d526 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java @@ -86,8 +86,10 @@ public class NoticeServiceImpl extends BaseServiceImpl @Override public PageData pageForReadOnly(Map params) { String noticeTitle = (String) params.get("noticeTitle"); + String gridId = (String) params.get("gridId"); params.put("noticeTitle", noticeTitle.trim()); params.put("deptIdList", SecurityUser.getUser().getDeptIdList()); + params.put("gridId",gridId.trim()); IPage page = getPage(params); List list = baseDao.selectListByDeptId(params); return new PageData<>(list, page.getTotal()); diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml index 07f0fdcd3..6f7f5d09b 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml @@ -72,6 +72,9 @@ LEFT JOIN epdc_notice n ON t0.NOTICE_ID = n.ID WHERE n.ID IS NOT NULL AND n.DEL_FLAG = '0' AND n.NOTICE_TITLE LIKE '%${noticeTitle}%' + + AND n.ALL_DEPT_IDS like concat('%', #{gridId}, '%') + ORDER BY n.CREATED_TIME DESC