fix bug 41839 标协会员项目-会议维护--会议负责人应该只能看自己的
This commit is contained in:
+1
-1
@@ -49,7 +49,7 @@ public class TbMemberProjectController extends JeroController<TbMemberProject, I
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<TbMemberProject> queryWrapper = QueryGenerator.initQueryWrapper(tbMemberProject, req.getParameterMap());
|
||||
Page<TbMemberProject> page = new Page<>(pageNo, pageSize);
|
||||
IPage<TbMemberProject> pageList = tbMemberProjectService.page(page, queryWrapper);
|
||||
IPage<TbMemberProject> pageList = tbMemberProjectService.queryPageList(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
|
||||
+4
-1
@@ -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 com.jero.project.entity.PayWorkGroupSubletStatistics;
|
||||
import com.jero.statistics.entity.AllProjectStatistics;
|
||||
@@ -14,9 +16,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
/**
|
||||
* @Description: 标协会员项目表
|
||||
* @Author: jero-boot
|
||||
* @Date: 2021-09-01
|
||||
* @Date: 2021-09-01
|
||||
* @Version: V1.0
|
||||
*/
|
||||
public interface TbMemberProjectMapper extends BaseMapper<TbMemberProject> {
|
||||
|
||||
IPage<TbMemberProject> queryPageList(Page<TbMemberProject> page, @Param(Constants.WRAPPER) QueryWrapper<TbMemberProject> queryWrapper);
|
||||
}
|
||||
|
||||
+6
@@ -9,4 +9,10 @@
|
||||
<result column="update_time" property="updateTime" />
|
||||
<result column="project_name" property="projectName" />
|
||||
</resultMap>
|
||||
|
||||
<select id="queryPageList" resultMap="TbMemberProjectResultMap">
|
||||
select tmp.* from tb_member_project tmp
|
||||
left join pay_meeting pm on tmp.id = pm.standards_id
|
||||
${ew.customSqlSegment}
|
||||
</select>
|
||||
</mapper>
|
||||
+2
@@ -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.TbMemberProject;
|
||||
@@ -65,4 +66,5 @@ public interface ITbMemberProjectService extends IService<TbMemberProject> {
|
||||
*/
|
||||
List<TbMemberProject> queryList();
|
||||
|
||||
IPage<TbMemberProject> queryPageList(Page<TbMemberProject> page, QueryWrapper<TbMemberProject> queryWrapper);
|
||||
}
|
||||
|
||||
+16
@@ -1,7 +1,10 @@
|
||||
package com.jero.member.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
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;
|
||||
@@ -14,12 +17,14 @@ import com.jero.member.mapper.TbMemberProjectMapper;
|
||||
import com.jero.member.service.ITbMemberProjectService;
|
||||
import com.jero.member.service.ITbMemberProjectSubitemService;
|
||||
import org.apache.commons.collections.CollectionUtils;
|
||||
import org.apache.shiro.SecurityUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import com.jero.project.entity.PayWorkGroupSubletStatistics;
|
||||
import com.jero.statistics.entity.AllProjectStatistics;
|
||||
import com.jero.statistics.entity.AllProjectStatisticsSearch;
|
||||
import org.springframework.stereotype.Service;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
@@ -42,6 +47,8 @@ public class TbMemberProjectServiceImpl extends ServiceImpl<TbMemberProjectMappe
|
||||
|
||||
@Autowired
|
||||
private IPayIncomeContractService payIncomeContractService;
|
||||
@Resource
|
||||
private RolePermissionService rolePermissionService;
|
||||
/**
|
||||
* 保存
|
||||
*/
|
||||
@@ -102,4 +109,13 @@ public class TbMemberProjectServiceImpl extends ServiceImpl<TbMemberProjectMappe
|
||||
return list();
|
||||
}
|
||||
|
||||
@Override
|
||||
public IPage<TbMemberProject> queryPageList(Page<TbMemberProject> page, QueryWrapper<TbMemberProject> queryWrapper) {
|
||||
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||
if (!rolePermissionService.getRolePermission("stardsMember:search")) {
|
||||
queryWrapper.eq("pm.director_id",sysUser.getId());
|
||||
}
|
||||
return baseMapper.queryPageList(page,queryWrapper);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user