From 8453fdcc5956cc965d7cb50e39a4b46d8f1374bd Mon Sep 17 00:00:00 2001 From: ly19960718 <1622779752@qq.com> Date: Wed, 5 May 2021 13:10:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E7=99=BB=E5=BD=95=E6=9C=BA?= =?UTF-8?q?=E6=9E=84=E7=BB=91=E5=AE=9A=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/apply/impl/ApplyServiceImpl.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/main/java/cn/com/tenlion/service/apply/impl/ApplyServiceImpl.java b/src/main/java/cn/com/tenlion/service/apply/impl/ApplyServiceImpl.java index 45d0e69..43030a4 100644 --- a/src/main/java/cn/com/tenlion/service/apply/impl/ApplyServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/apply/impl/ApplyServiceImpl.java @@ -1,5 +1,6 @@ package cn.com.tenlion.service.apply.impl; +import cn.com.tenlion.institutionmanagement.pojo.dtos.institution.InstitutionDTO; import cn.com.tenlion.pojo.dtos.apply.ApplyClassPlanDTO; import cn.com.tenlion.pojo.dtos.classplan.ClassPlanDTO; import cn.com.tenlion.pojo.dtos.distributioncard.DistributionCardDTO; @@ -9,6 +10,7 @@ import cn.com.tenlion.pojo.vos.traininginstitutionuser.InstitutionUserVO; import cn.com.tenlion.service.applyauditlog.IApplyAuditLogService; import cn.com.tenlion.service.classplan.IClassPlanService; import cn.com.tenlion.service.examination.distributioncard.IDistributionCardService; +import cn.com.tenlion.service.traininginstitutionuser.ITrainingInstitutionUserService; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.exceptions.ParamsException; import ink.wgink.exceptions.SaveException; @@ -55,6 +57,8 @@ public class ApplyServiceImpl extends DefaultBaseService implements IApplyServic private IClassPlanService classPlanService; @Autowired private IDistributionCardService distributionCardService; + @Autowired + private ITrainingInstitutionUserService trainingInstitutionUserService; @@ -327,10 +331,15 @@ public class ApplyServiceImpl extends DefaultBaseService implements IApplyServic @Override public SuccessResultList> listPage(ListPage page) { - InstitutionUserVO institutionUserVO = securityComponent.getExpandData(InstitutionUserVO.class); - if(institutionUserVO != null){ - page.getParams().put("applyInstitutionId",institutionUserVO.getInstitutionId()); + InstitutionDTO institutionDTO = trainingInstitutionUserService.getByUserId(securityComponent.getCurrentUser().getUserId()); + if(institutionDTO != null){ + page.getParams().put("applyInstitutionId",institutionDTO.getInstitutionId()); } + +// InstitutionUserVO institutionUserVO = securityComponent.getExpandData(InstitutionUserVO.class); +// if(institutionUserVO != null){ +// page.getParams().put("applyInstitutionId",institutionUserVO.getInstitutionId()); +// } PageHelper.startPage(page.getPage(), page.getRows()); List applyDTOs = list(page.getParams()); PageInfo pageInfo = new PageInfo<>(applyDTOs);