From 3c2329202feed090aa82dbfa4172639d876183fd Mon Sep 17 00:00:00 2001 From: weikai <123456> Date: Tue, 19 May 2020 17:30:42 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90pc=E7=AB=AF=20=E6=96=B0=E9=97=BB?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=95=B0,=E7=A4=BE=E7=BE=A4=E4=B9=A6,?= =?UTF-8?q?=E7=A4=BE=E7=BE=A4=E8=AF=9D=E9=A2=98=E6=95=B0=E3=80=91-?= =?UTF-8?q?=E3=80=90=E6=95=B0=E6=8D=AE=E6=A0=A1=E9=AA=8Csql=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E3=80=91-=EF=BC=88=E9=AD=8F=E5=87=AF=EF=BC=89-2020/05?= =?UTF-8?q?/19?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../group/service/impl/GroupServiceImpl.java | 21 +++++++++++++------ .../topic/service/impl/TopicServiceImpl.java | 9 ++++++++ .../main/resources/mapper/group/GroupDao.xml | 6 ++++++ .../main/resources/mapper/topic/TopicDao.xml | 6 ++++++ .../src/main/resources/mapper/NewsDao.xml | 4 ++-- 5 files changed, 38 insertions(+), 8 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java index 283e5f63c..bc0f431b3 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java @@ -25,6 +25,8 @@ import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.constant.OrganizationTypeConstant; import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; +import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.constant.SysSmsTemplateConstant; @@ -97,6 +99,13 @@ public class GroupServiceImpl extends BaseServiceImpl imp @Override public PageData page(Map params) { + //获取数据权限 + UserDetail userDetail = SecurityUser.getUser(); + if (null == userDetail.getDeptIdList() || userDetail.getDeptIdList().size() == 0) { + params.put("deptIdList",null); + }else { + params.put("deptIdList",userDetail.getDeptIdList()); + } IPage page = getPage(params); List list = baseDao.selectListOfGroups(params); return new PageData<>(list, page.getTotal()); @@ -530,13 +539,13 @@ public class GroupServiceImpl extends BaseServiceImpl imp return !StringUtils.isEmpty(formDto.getMobile()); } - /** + /** * @Description: 社群管理 建群通过、不通过 短信通知 - * @Param: [dto, userId] - * @return: void - * @Author: zy - * @Date: 2020-01-08 - */ + * @Param: [dto, userId] + * @return: void + * @Author: zy + * @Date: 2020-01-08 + */ private void groupManagementSmsNotification(GroupSettingStateDTO dto, String groupId){ //根据社区id，获取用户手机号 String mobile = baseDao.queryGroupUserMOBILE(groupId); diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java index e6944dd72..5eabd576d 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java @@ -23,6 +23,8 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; +import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.DateUtils; import com.elink.esua.epdc.commons.tools.utils.Result; @@ -117,6 +119,13 @@ public class TopicServiceImpl extends BaseServiceImpl imp @Override public PageData listTopic(Map params) { IPage page = getPage(params); + //获取数据权限 + UserDetail userDetail = SecurityUser.getUser(); + if (null == userDetail.getDeptIdList() || userDetail.getDeptIdList().size() == 0) { + params.put("deptIdList",null); + }else { + params.put("deptIdList",userDetail.getDeptIdList()); + } List list = baseDao.selectListTopic(params); return new PageData<>(list, page.getTotal()); } diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml index 97bf9facb..5cedcb05b 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml @@ -18,6 +18,12 @@ AND ugp.LORD_FLAG = '1' WHERE gp.DEL_FLAG = '0' + + AND gp.GRID_ID in + + #{deptId} + + AND gp.STATE = #{state} diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/topic/TopicDao.xml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/topic/TopicDao.xml index 3084f88a0..389b0d692 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/topic/TopicDao.xml +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/topic/TopicDao.xml @@ -197,6 +197,12 @@ WHERE temp.DEL_FLAG = '0' AND temp.STATE IN ( 0, 5, 20) + + AND temp.GRID_ID in + + #{deptId} + + AND temp.STATE in (0,5,10,15) diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsDao.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsDao.xml index 0a7a42c00..7d6d5e76e 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsDao.xml +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsDao.xml @@ -110,7 +110,7 @@ GROUP BY nd.NEWS_ID ) t0 - LEFT JOIN epdc_news n ON t0.NEWS_ID = n.ID + LEFT JOIN epdc_news n ON find_in_set(t0.NEWS_ID, n.ALL_DEPT_IDS) WHERE n.ID IS NOT NULL AND n.DEL_FLAG = '0' @@ -148,4 +148,4 @@ UPDATE epdc_news SET DEPT_NAME = #{newDeptName}, UPDATED_TIME = NOW() WHERE DEPT_ID = #{deptId} - \ No newline at end of file +