fix 水平权限

This commit is contained in:
lijiarao
2021-10-25 11:53:47 +08:00
parent 0299d811d0
commit c4793c5063
3 changed files with 9 additions and 3 deletions
@@ -12,6 +12,7 @@ import com.jero.common.common.RoleCommon;
import com.jero.common.dto.SendMessageDTO;
import com.jero.common.enums.CompanyMessageEnums;
import com.jero.common.exception.JeroBootException;
import com.jero.common.service.RolePermissionService;
import com.jero.common.service.SendMessageService;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.query.QueryGenerator;
@@ -109,6 +110,8 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
private IOSSFileService iossFileService;
@Resource
private Environment env;
@Resource
private RolePermissionService rolePermissionService;
/**
* 新增会议
@@ -509,7 +512,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
@Override
public IPage<PayMeeting> queryPageList(PayMeeting payMeeting, Integer pageNo, Integer pageSize, HttpServletRequest req) {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if (Objects.equals(sysUser.getRoleCode(), RoleCommon.XMFZR)) {
if (!rolePermissionService.getRolePermission("generalProject:search")) {
payMeeting.setDirectorId(sysUser.getId());
}
QueryWrapper<PayMeeting> queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap());
@@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jero.common.api.vo.Result;
import com.jero.common.common.RoleCommon;
import com.jero.common.exception.JeroBootException;
import com.jero.common.service.RolePermissionService;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.system.vo.LoginUser;
@@ -66,6 +67,8 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
private IPayMemberProjectSubitemService memberProjectSubitemService;
@Resource
private ISysBaseAPI sysBaseAPI;
@Resource
private RolePermissionService rolePermissionService;
/**
@@ -79,7 +82,7 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if (Objects.equals(sysUser.getRoleCode(), RoleCommon.XMFZR)) {
if (!rolePermissionService.getRolePermission("generalProject:search")) {
payMemberProject.setDirectorId(sysUser.getId());
}
QueryWrapper<PayMemberProject> queryWrapper = QueryGenerator.initQueryWrapper(payMemberProject, req.getParameterMap());
@@ -91,7 +91,7 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
if(!CollectionUtils.isEmpty(listPayWorkingGroupVO)){
setPayWorkingGroupSubItem(listPayWorkingGroupVO);
listPayWorkingGroupVO.forEach(p->{
if(Objects.equals(sysUser.getRoleCode(), RoleCommon.XMFZR) && Objects.equals(p.getPrincipalIdB(),sysUser.getId())){
if(!rolePermissionService.getRolePermission("generalProject:search") && Objects.equals(p.getPrincipalIdB(),sysUser.getId())){
p.setCheckoutOperation(PayProjectCommon.CHECKOUT_OPERATION2);
}else{
p.setCheckoutOperation(PayProjectCommon.CHECKOUT_OPERATION1);