diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java index 998c8488..06d16fc2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java @@ -50,7 +50,7 @@ public class TbMemberProjectSubitemController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(tbMemberProjectSubitem, req.getParameterMap()); Page page = new Page<>(pageNo, pageSize); - IPage pageList = tbMemberProjectSubitemService.page(page, queryWrapper); + IPage pageList = tbMemberProjectSubitemService.pageList(page, queryWrapper); for (TbMemberProjectSubitem record : pageList.getRecords()) { record.setEmail(PasswordUtil.decrypt(record.getEmail())); record.setMobile(PasswordUtil.decrypt(record.getMobile())); @@ -64,7 +64,10 @@ public class TbMemberProjectSubitemController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(tbMemberProjectSubitem, request.getParameterMap()); + Page page = new Page<>(-1, -1); + IPage pageList = tbMemberProjectSubitemService.pageList(page, queryWrapper); + return super.exportListXls(pageList.getRecords(), TbMemberProjectSubitem.class, "标协会员项目成员表"); } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/TbMemberProjectSubitemMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/TbMemberProjectSubitemMapper.java index 0692e75c..5bd168f5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/TbMemberProjectSubitemMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/TbMemberProjectSubitemMapper.java @@ -2,7 +2,9 @@ package com.jero.member.mapper; import java.util.List; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import com.jero.member.entity.TbMemberProjectSubitem; @@ -29,4 +31,5 @@ public interface TbMemberProjectSubitemMapper extends BaseMapper queryListByCompany(Page page,@Param("companyId") String companyId,@Param("projectType") String projectType,@Param("pack") Integer pack,@Param("packYear") String packYear); + IPage pageList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml index e3451132..4a9617c6 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml @@ -39,4 +39,11 @@ GROUP BY tmps.id ORDER BY tmps.create_time DESC + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java index 0fae382a..bb5bc3f9 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java @@ -1,5 +1,6 @@ package com.jero.member.service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.member.entity.TbMemberProjectSubitem; @@ -71,4 +72,6 @@ public interface ITbMemberProjectSubitemService extends IService queryListByCompany(Page page, String companyId, String projectType,Integer pack,String packYear); + + IPage pageList(Page page, QueryWrapper queryWrapper); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/TbMemberProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/TbMemberProjectServiceImpl.java index 1231b63a..925c5055 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/TbMemberProjectServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/TbMemberProjectServiceImpl.java @@ -113,7 +113,11 @@ public class TbMemberProjectServiceImpl extends ServiceImpl queryPageList(Page page, QueryWrapper queryWrapper) { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); if (!rolePermissionService.getRolePermission("stardsMember:search")) { - queryWrapper.eq("pm.director_id",sysUser.getId()); + queryWrapper.or( + a -> a.eq("pm.director_id",sysUser.getId()) + .or() + .eq("tmp.director_id",sysUser.getId()) + ); } return baseMapper.queryPageList(page,queryWrapper); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/TbMemberProjectSubitemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/TbMemberProjectSubitemServiceImpl.java index d7603a1e..3a53315e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/TbMemberProjectSubitemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/TbMemberProjectSubitemServiceImpl.java @@ -1,10 +1,13 @@ package com.jero.member.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.exception.JeroBootException; +import com.jero.common.service.RolePermissionService; +import com.jero.common.system.vo.LoginUser; import com.jero.contract.entity.PayIncomeContractAssociated; import com.jero.contract.service.IPayIncomeContractAssociatedService; import com.jero.contract.service.IPayIncomeContractService; @@ -17,6 +20,7 @@ import com.jero.pack.service.IPayPackCompanyProjectService; import com.jero.project.common.PayProjectCommon; import com.jero.temporary.service.IPayCompanyManagementTemporaryService; import com.jero.temporary.service.IPayContactsManagementTemporaryService; +import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -54,6 +58,8 @@ public class TbMemberProjectSubitemServiceImpl extends ServiceImpl queryListByCompany(Page page, String companyId, String projectType,Integer pack,String packYear) { return tbMemberProjectSubitemMapper.queryListByCompany(page, companyId, projectType,pack,packYear); } + + @Override + public IPage pageList(Page page, QueryWrapper queryWrapper) { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + if (!rolePermissionService.getRolePermission("safeguardStardsMember:search")) { + queryWrapper.eq("tmp.director_id",sysUser.getId()); + } + return baseMapper.pageList(page,queryWrapper); + } }