From 4f27b7dd5af284fa48857aeb446f3dbaddbecf39 Mon Sep 17 00:00:00 2001 From: wans <747101512@qq.com> Date: Fri, 23 Oct 2020 10:19:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=96=B9=E6=B3=95=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/AdvancedModelServiceImpl.java | 2 ++ .../impl/PartyRulesServiceImpl.java | 1 + .../FamousSecretaryOfficeServiceImpl.java | 2 ++ .../impl/InteractiveActivityServiceImpl.java | 2 ++ .../impl/PartyBuildingCaseServiceImpl.java | 2 ++ .../impl/PartyMemberPointsServiceImpl.java | 2 ++ .../impl/PartyPaymentServiceImpl.java | 2 ++ .../impl/ThreeMeetLessonServiceImpl.java | 7 +++++-- .../advancedmodel/advancedmodel-mapper.xml | 11 ++++++++++ .../famoussecretaryoffice-mapper.xml | 11 ++++++++++ .../interactiveactivity-mapper.xml | 11 ++++++++++ .../partybuildingcase-mapper.xml | 11 ++++++++++ .../partymemberpoints-mapper.xml | 11 ++++++++++ .../partypayment/partypayment-mapper.xml | 11 ++++++++++ .../mapper/partyrules/partyrules-mapper.xml | 20 +++++++++---------- .../threemeetlesson-mapper.xml | 11 ++++++++++ 16 files changed, 105 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/cm/partybuilding/service/advancedmodel/impl/AdvancedModelServiceImpl.java b/src/main/java/com/cm/partybuilding/service/advancedmodel/impl/AdvancedModelServiceImpl.java index e199841..2255711 100644 --- a/src/main/java/com/cm/partybuilding/service/advancedmodel/impl/AdvancedModelServiceImpl.java +++ b/src/main/java/com/cm/partybuilding/service/advancedmodel/impl/AdvancedModelServiceImpl.java @@ -169,6 +169,8 @@ public class AdvancedModelServiceImpl extends AbstractService implements IAdvanc @Override public SuccessResultList> listPageAdvancedModel(ListPage page) throws SearchException { PageHelper.startPage(page.getPage(), page.getRows()); + setDataAuthorityInfo(page.getParams()); + page.getParams().put("creator",securityComponent.getCurrentUser().getUserId()); List advancedModelDTOs = advancedModelDao.listAdvancedModel(page.getParams()); PageInfo pageInfo = new PageInfo<>(advancedModelDTOs); return new SuccessResultList<>(advancedModelDTOs, pageInfo.getPageNum(), pageInfo.getTotal()); diff --git a/src/main/java/com/cm/partybuilding/service/articlecontent/impl/PartyRulesServiceImpl.java b/src/main/java/com/cm/partybuilding/service/articlecontent/impl/PartyRulesServiceImpl.java index a7142e1..c483a85 100644 --- a/src/main/java/com/cm/partybuilding/service/articlecontent/impl/PartyRulesServiceImpl.java +++ b/src/main/java/com/cm/partybuilding/service/articlecontent/impl/PartyRulesServiceImpl.java @@ -27,6 +27,7 @@ public class PartyRulesServiceImpl extends BaseService implements IPartyRulesSer @Override public SuccessResultList> listPagePartyRules(ListPage page) { PageHelper.startPage(page.getPage(), page.getRows()); + //page.getParams().put("creator",securityComponent.getCurrentUser().getUserId()); List articleContentDTOs = partyRulesDao.listPagePartyRules(page.getParams()); PageInfo pageInfo = new PageInfo<>(articleContentDTOs); return new SuccessResultList<>(articleContentDTOs, pageInfo.getPageNum(), pageInfo.getTotal()); diff --git a/src/main/java/com/cm/partybuilding/service/famoussecretaryoffice/impl/FamousSecretaryOfficeServiceImpl.java b/src/main/java/com/cm/partybuilding/service/famoussecretaryoffice/impl/FamousSecretaryOfficeServiceImpl.java index fe49762..5da1773 100644 --- a/src/main/java/com/cm/partybuilding/service/famoussecretaryoffice/impl/FamousSecretaryOfficeServiceImpl.java +++ b/src/main/java/com/cm/partybuilding/service/famoussecretaryoffice/impl/FamousSecretaryOfficeServiceImpl.java @@ -169,6 +169,8 @@ public class FamousSecretaryOfficeServiceImpl extends AbstractService implements @Override public SuccessResultList> listPageFamousSecretaryOffice(ListPage page) throws SearchException { PageHelper.startPage(page.getPage(), page.getRows()); + setDataAuthorityInfo(page.getParams()); + page.getParams().put("creator",securityComponent.getCurrentUser().getUserId()); List famousSecretaryOfficeDTOs = famousSecretaryOfficeDao.listFamousSecretaryOffice(page.getParams()); PageInfo pageInfo = new PageInfo<>(famousSecretaryOfficeDTOs); return new SuccessResultList<>(famousSecretaryOfficeDTOs, pageInfo.getPageNum(), pageInfo.getTotal()); diff --git a/src/main/java/com/cm/partybuilding/service/interactiveactivity/impl/InteractiveActivityServiceImpl.java b/src/main/java/com/cm/partybuilding/service/interactiveactivity/impl/InteractiveActivityServiceImpl.java index 7146fce..84a91c1 100644 --- a/src/main/java/com/cm/partybuilding/service/interactiveactivity/impl/InteractiveActivityServiceImpl.java +++ b/src/main/java/com/cm/partybuilding/service/interactiveactivity/impl/InteractiveActivityServiceImpl.java @@ -169,6 +169,8 @@ public class InteractiveActivityServiceImpl extends AbstractService implements I @Override public SuccessResultList> listPageInteractiveActivity(ListPage page) throws SearchException { PageHelper.startPage(page.getPage(), page.getRows()); + setDataAuthorityInfo(page.getParams()); + page.getParams().put("creator",securityComponent.getCurrentUser().getUserId()); List interactiveActivityDTOs = interactiveActivityDao.listInteractiveActivity(page.getParams()); PageInfo pageInfo = new PageInfo<>(interactiveActivityDTOs); return new SuccessResultList<>(interactiveActivityDTOs, pageInfo.getPageNum(), pageInfo.getTotal()); diff --git a/src/main/java/com/cm/partybuilding/service/partybuildingcase/impl/PartyBuildingCaseServiceImpl.java b/src/main/java/com/cm/partybuilding/service/partybuildingcase/impl/PartyBuildingCaseServiceImpl.java index 5f7bc19..d8d5bc0 100644 --- a/src/main/java/com/cm/partybuilding/service/partybuildingcase/impl/PartyBuildingCaseServiceImpl.java +++ b/src/main/java/com/cm/partybuilding/service/partybuildingcase/impl/PartyBuildingCaseServiceImpl.java @@ -175,6 +175,8 @@ public class PartyBuildingCaseServiceImpl extends AbstractService implements IPa @Override public SuccessResultList> listPagePartyBuildingCase(ListPage page) throws SearchException { PageHelper.startPage(page.getPage(), page.getRows()); + setDataAuthorityInfo(page.getParams()); + page.getParams().put("creator",securityComponent.getCurrentUser().getUserId()); List partyBuildingCaseDTOs = partyBuildingCaseDao.listPartyBuildingCase(page.getParams()); for (PartyBuildingCaseDTO item : partyBuildingCaseDTOs){ if("1".equals(item.getCreator().trim())){ diff --git a/src/main/java/com/cm/partybuilding/service/partymemberpoints/impl/PartyMemberPointsServiceImpl.java b/src/main/java/com/cm/partybuilding/service/partymemberpoints/impl/PartyMemberPointsServiceImpl.java index 46f9caf..cb6fcc2 100644 --- a/src/main/java/com/cm/partybuilding/service/partymemberpoints/impl/PartyMemberPointsServiceImpl.java +++ b/src/main/java/com/cm/partybuilding/service/partymemberpoints/impl/PartyMemberPointsServiceImpl.java @@ -180,6 +180,8 @@ public class PartyMemberPointsServiceImpl extends AbstractService implements IPa @Override public SuccessResultList> listPagePartyMemberPoints(ListPage page) throws SearchException { PageHelper.startPage(page.getPage(), page.getRows()); + page.getParams().put("creator",securityComponent.getCurrentUser().getUserId()); + setDataAuthorityInfo(page.getParams()); List partyMemberPointsDTOs = partyMemberPointsDao.listPartyMemberPoints(page.getParams()); PageInfo pageInfo = new PageInfo<>(partyMemberPointsDTOs); return new SuccessResultList<>(partyMemberPointsDTOs, pageInfo.getPageNum(), pageInfo.getTotal()); diff --git a/src/main/java/com/cm/partybuilding/service/partypayment/impl/PartyPaymentServiceImpl.java b/src/main/java/com/cm/partybuilding/service/partypayment/impl/PartyPaymentServiceImpl.java index e3116eb..7b26b77 100644 --- a/src/main/java/com/cm/partybuilding/service/partypayment/impl/PartyPaymentServiceImpl.java +++ b/src/main/java/com/cm/partybuilding/service/partypayment/impl/PartyPaymentServiceImpl.java @@ -181,6 +181,8 @@ public class PartyPaymentServiceImpl extends AbstractService implements IPartyPa @Override public SuccessResultList> listPagePartyPayment(ListPage page) throws SearchException { PageHelper.startPage(page.getPage(), page.getRows()); + setDataAuthorityInfo(page.getParams()); + page.getParams().put("creator",securityComponent.getCurrentUser().getUserId()); List partyPaymentDTOs = partyPaymentDao.listPartyPayment(page.getParams()); PageInfo pageInfo = new PageInfo<>(partyPaymentDTOs); return new SuccessResultList<>(partyPaymentDTOs, pageInfo.getPageNum(), pageInfo.getTotal()); diff --git a/src/main/java/com/cm/partybuilding/service/threemeetlesson/impl/ThreeMeetLessonServiceImpl.java b/src/main/java/com/cm/partybuilding/service/threemeetlesson/impl/ThreeMeetLessonServiceImpl.java index bd5d13c..471aa54 100644 --- a/src/main/java/com/cm/partybuilding/service/threemeetlesson/impl/ThreeMeetLessonServiceImpl.java +++ b/src/main/java/com/cm/partybuilding/service/threemeetlesson/impl/ThreeMeetLessonServiceImpl.java @@ -2,7 +2,6 @@ package com.cm.partybuilding.service.threemeetlesson.impl; import com.cm.common.base.AbstractService; import com.cm.common.exception.RemoveException; -import com.cm.common.exception.SaveException; import com.cm.common.exception.SearchException; import com.cm.common.pojo.ListPage; import com.cm.common.result.SuccessResult; @@ -19,7 +18,9 @@ import com.github.pagehelper.PageInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.Arrays; +import java.util.List; +import java.util.Map; /** * @ClassName: ThreeMeetLessonServiceImpl @@ -169,6 +170,8 @@ public class ThreeMeetLessonServiceImpl extends AbstractService implements IThre @Override public SuccessResultList> listPageThreeMeetLesson(ListPage page) throws SearchException { PageHelper.startPage(page.getPage(), page.getRows()); + setDataAuthorityInfo(page.getParams()); + page.getParams().put("creator",securityComponent.getCurrentUser().getUserId()); List threeMeetLessonDTOs = threeMeetLessonDao.listThreeMeetLesson(page.getParams()); PageInfo pageInfo = new PageInfo<>(threeMeetLessonDTOs); return new SuccessResultList<>(threeMeetLessonDTOs, pageInfo.getPageNum(), pageInfo.getTotal()); diff --git a/src/main/resources/mybatis/mapper/advancedmodel/advancedmodel-mapper.xml b/src/main/resources/mybatis/mapper/advancedmodel/advancedmodel-mapper.xml index 91a3e39..e6b263b 100644 --- a/src/main/resources/mybatis/mapper/advancedmodel/advancedmodel-mapper.xml +++ b/src/main/resources/mybatis/mapper/advancedmodel/advancedmodel-mapper.xml @@ -172,6 +172,17 @@ #{advancedModelIds[${index}]} + + + AND t1.creator = #{creator} + + + AND t1.creator IN + + #{data_creators[${index}]} + + + diff --git a/src/main/resources/mybatis/mapper/famoussecretaryoffice/famoussecretaryoffice-mapper.xml b/src/main/resources/mybatis/mapper/famoussecretaryoffice/famoussecretaryoffice-mapper.xml index b10c092..b8e1917 100644 --- a/src/main/resources/mybatis/mapper/famoussecretaryoffice/famoussecretaryoffice-mapper.xml +++ b/src/main/resources/mybatis/mapper/famoussecretaryoffice/famoussecretaryoffice-mapper.xml @@ -169,6 +169,17 @@ #{famousSecretaryOfficeIds[${index}]} + + + AND t1.creator = #{creator} + + + AND t1.creator IN + + #{data_creators[${index}]} + + + diff --git a/src/main/resources/mybatis/mapper/interactiveactivity/interactiveactivity-mapper.xml b/src/main/resources/mybatis/mapper/interactiveactivity/interactiveactivity-mapper.xml index 1b1326a..a406d0e 100644 --- a/src/main/resources/mybatis/mapper/interactiveactivity/interactiveactivity-mapper.xml +++ b/src/main/resources/mybatis/mapper/interactiveactivity/interactiveactivity-mapper.xml @@ -151,6 +151,17 @@ #{interactiveActivityIds[${index}]} + + + AND t1.creator = #{creator} + + + AND t1.creator IN + + #{data_creators[${index}]} + + + diff --git a/src/main/resources/mybatis/mapper/partybuildingcase/partybuildingcase-mapper.xml b/src/main/resources/mybatis/mapper/partybuildingcase/partybuildingcase-mapper.xml index 86654ad..3abdd73 100644 --- a/src/main/resources/mybatis/mapper/partybuildingcase/partybuildingcase-mapper.xml +++ b/src/main/resources/mybatis/mapper/partybuildingcase/partybuildingcase-mapper.xml @@ -140,6 +140,17 @@ #{partyBuildingCaseIds[${index}]} + + + AND t1.creator = #{creator} + + + AND t1.creator IN + + #{data_creators[${index}]} + + + ORDER BY t1.gmt_create DESC diff --git a/src/main/resources/mybatis/mapper/partymemberpoints/partymemberpoints-mapper.xml b/src/main/resources/mybatis/mapper/partymemberpoints/partymemberpoints-mapper.xml index d41f82d..63e817a 100644 --- a/src/main/resources/mybatis/mapper/partymemberpoints/partymemberpoints-mapper.xml +++ b/src/main/resources/mybatis/mapper/partymemberpoints/partymemberpoints-mapper.xml @@ -129,6 +129,17 @@ #{partyMemberPointsIds[${index}]} + + + AND t1.creator = #{creator} + + + AND t1.creator IN + + #{data_creators[${index}]} + + + ORDER BY t1.current_points DESC diff --git a/src/main/resources/mybatis/mapper/partypayment/partypayment-mapper.xml b/src/main/resources/mybatis/mapper/partypayment/partypayment-mapper.xml index 2a9fcf4..bde966b 100644 --- a/src/main/resources/mybatis/mapper/partypayment/partypayment-mapper.xml +++ b/src/main/resources/mybatis/mapper/partypayment/partypayment-mapper.xml @@ -155,6 +155,17 @@ #{partyPaymentIds[${index}]} + + + AND t1.creator = #{creator} + + + AND t1.creator IN + + #{data_creators[${index}]} + + + ORDER BY t1.payment_date DESC diff --git a/src/main/resources/mybatis/mapper/partyrules/partyrules-mapper.xml b/src/main/resources/mybatis/mapper/partyrules/partyrules-mapper.xml index 0bff478..fc7c7c0 100644 --- a/src/main/resources/mybatis/mapper/partyrules/partyrules-mapper.xml +++ b/src/main/resources/mybatis/mapper/partyrules/partyrules-mapper.xml @@ -71,16 +71,16 @@ #{articleContentIds[${index}]} - - AND - t1.creator = #{creator} - - - AND - t1.creator IN - - #{creators[${index}]} - + + + AND t1.creator = #{creator} + + + AND t1.creator IN + + #{data_creators[${index}]} + + ORDER BY t1.publish_date DESC diff --git a/src/main/resources/mybatis/mapper/threemeetlesson/threemeetlesson-mapper.xml b/src/main/resources/mybatis/mapper/threemeetlesson/threemeetlesson-mapper.xml index 74a4696..9755ca9 100644 --- a/src/main/resources/mybatis/mapper/threemeetlesson/threemeetlesson-mapper.xml +++ b/src/main/resources/mybatis/mapper/threemeetlesson/threemeetlesson-mapper.xml @@ -172,6 +172,17 @@ AND LEFT(t1.decide_time, 10) #{endTime} + + + AND t1.creator = #{creator} + + + AND t1.creator IN + + #{data_creators[${index}]} + + +