yinq
/
hwbm-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.1.62 合同信息、合同执行信息数据权限仅限本人或合同管理角色能看所有合同。

Browse Source
dev
yinq 4 weeks ago
parent 8a1634884d
commit 79fe322276
4 changed files with 96 additions and 25 deletions
Show Stats Download Patch File Download Diff File

20
ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/mapper/ErpContractInfoMapper.java
Unescape Escape View File

@ -26,11 +26,11 @@ public interface ErpContractInfoMapper extends BaseMapperPlus<ErpContractInfo, E
* @param queryWrapper 条件
* @return 合同信息集合
*/
@DataPermission({
@DataColumn(key = "deptName", value = "t.create_dept"),
@DataColumn(key = "userName", value = "t.create_by"),
@DataColumn(key = "userName", value = "t.contract_manager_id")
})
// @DataPermission({
// @DataColumn(key = "deptName", value = "t.create_dept"),
// @DataColumn(key = "userName", value = "t.create_by"),
// @DataColumn(key = "userName", value = "t.contract_manager_id")
// })
public Page<ErpContractInfoVo> selectCustomErpContractInfoVoList(@Param("page") Page<ErpContractInfoVo> page, @Param(Constants.WRAPPER) MPJLambdaWrapper<ErpContractInfo> queryWrapper);
/**
@ -39,11 +39,11 @@ public interface ErpContractInfoMapper extends BaseMapperPlus<ErpContractInfo, E
* @param queryWrapper 条件
* @return 合同信息集合
*/
@DataPermission({
@DataColumn(key = "deptName", value = "t.create_dept"),
@DataColumn(key = "userName", value = "t.create_by"),
@DataColumn(key = "userName", value = "t.contract_manager_id")
})
// @DataPermission({
// @DataColumn(key = "deptName", value = "t.create_dept"),
// @DataColumn(key = "userName", value = "t.create_by"),
// @DataColumn(key = "userName", value = "t.contract_manager_id")
// })
public List<ErpContractInfoVo> selectCustomErpContractInfoVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper<ErpContractInfo> queryWrapper);

11
ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/mapper/ErpProjectInfoMapper.java
Unescape Escape View File

@ -67,17 +67,6 @@ public interface ErpProjectInfoMapper extends BaseMapperPlus<ErpProjectInfo, Erp
// })
public Page<ErpProjectInfoVo> selectErpProjectInfoVoJoinList(@Param("page") Page<ErpProjectInfoVo> page, @Param(Constants.WRAPPER) MPJLambdaWrapper<ErpProjectInfo> queryWrapper);
/**
* 查询项目信息列表，主要财务应收款使用
*
* @param queryWrapper 条件
* @return 项目信息集合
*/
@DataPermission({
@DataColumn(key = "deptName", value = "t.dept_id"),
@DataColumn(key = "userName", value = "t.create_by")
})
public List<ErpProjectInfoVo> selectErpProjectInfoVoJoinList(@Param(Constants.WRAPPER) MPJLambdaWrapper<ErpProjectInfo> queryWrapper);
}

33
ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractInfoServiceImpl.java
Unescape Escape View File

@ -1,7 +1,9 @@
package org.dromara.oa.erp.service.impl;
import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.convert.NumberChineseFormatter;
import cn.hutool.core.map.MapUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@ -22,6 +24,7 @@ import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.common.tenant.helper.TenantHelper;
import org.dromara.oa.base.domain.bo.BaseRelationMaterialBo;
import org.dromara.oa.base.domain.vo.BaseRelationMaterialVo;
@ -71,6 +74,11 @@ public class ErpContractInfoServiceImpl implements IErpContractInfoService {
/** 合同审批流程编码（与流程引擎中 flowCode 一致） */
public static final String FLOW_CODE_CONTRACT = "OAC";
/**
* 合同管理员角色权限字符（sys_role.role_key），拥有后可查看全部合同数据
*/
private static final String CONTRACT_ADMIN_ROLE_KEY = "HTGLSJQX";
private final ErpContractInfoMapper baseMapper;
private final ErpContractMaterialMapper contractMaterialMapper;
@ -86,6 +94,30 @@ public class ErpContractInfoServiceImpl implements IErpContractInfoService {
@DubboReference(timeout = 30000)
private RemoteWorkflowService remoteWorkflowService;
/**
* 是否具备合同全量数据权限（合同管理员角色或超级管理员）
*/
private boolean isContractDataAdmin() {
return LoginHelper.isSuperAdmin() || StpUtil.hasRole(CONTRACT_ADMIN_ROLE_KEY);
}
/**
* 无合同管理员角色时仅查询本人创建或当前合同负责人是本人的合同
*/
private void applyContractDataScope(MPJLambdaWrapper<ErpContractInfo> lqw) {
if (isContractDataAdmin()) {
return;
}
Long userId = LoginHelper.getUserId();
if (userId == null) {
lqw.eq(ErpContractInfo::getContractId, -1L);
return;
}
lqw.and(w -> w.eq(ErpContractInfo::getCreateBy, userId)
.or()
.eq(ErpContractInfo::getContractManagerId, userId));
}
/**
* 查询合同信息
*
@ -251,6 +283,7 @@ public class ErpContractInfoServiceImpl implements IErpContractInfoService {
.eq(bo.getFrameworkValidPeriod() != null, ErpContractInfo::getFrameworkValidPeriod, bo.getFrameworkValidPeriod())
.eq("t.del_flag", "0")
.eq("t.active_flag", "1");
applyContractDataScope(lqw);
return lqw;
}

57
ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractOrderServiceImpl.java
Unescape Escape View File

@ -1,6 +1,8 @@
package org.dromara.oa.erp.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
@ -49,6 +51,7 @@ import org.dromara.oa.erp.domain.vo.ErpProjectTypeVo;
import org.dromara.oa.erp.constant.ProjectCategoryConstant;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.helper.DataPermissionHelper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.toolkit.JoinWrappers;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
@ -105,6 +108,11 @@ public class ErpContractOrderServiceImpl implements IErpContractOrderService {
*/
private static final String FLOW_CODE_PROJECT = "xmsq";
/**
* 合同管理员角色权限字符（sys_role.role_key），拥有后可查看/维护全部合同及合同执行数据
*/
private static final String CONTRACT_ADMIN_ROLE_KEY = "HTGLSJQX";
@DubboReference(timeout = 300000)
private RemoteWorkflowService remoteWorkflowService;
@ -114,6 +122,47 @@ public class ErpContractOrderServiceImpl implements IErpContractOrderService {
@DubboReference(timeout = 30000)
private RemoteWmsShippingBillService remoteWmsShippingBillService;
/**
* 是否具备合同全量数据权限（合同管理员角色或超级管理员）
*/
private boolean isContractDataAdmin() {
return LoginHelper.isSuperAdmin() || StpUtil.hasRole(CONTRACT_ADMIN_ROLE_KEY);
}
/**
* 无合同管理员角色时，仅查询关联合同为本人创建或本人负责管理的合同执行信息
*/
private void applyContractOrderDataScope(MPJLambdaWrapper<ErpProjectInfo> lqw) {
if (isContractDataAdmin()) {
return;
}
Long userId = LoginHelper.getUserId();
if (userId == null) {
lqw.eq(ErpProjectInfo::getProjectId, -1L);
return;
}
lqw.apply("(c.create_by = {0} OR c.contract_manager_id = {0})", userId);
}
/**
* 分页查询合同订单列表，忽略数据权限（用于后台自定义权限处理）
* @param page 分页对象
* @param lqw 查询条件
* @return 合同订单信息分页对象
*/
private Page<ErpProjectInfoVo> selectContractOrderPage(Page<ErpProjectInfoVo> page, MPJLambdaWrapper<ErpProjectInfo> lqw) {
return DataPermissionHelper.ignore(() -> projectInfoMapper.selectCustomErpProjectInfoVoList(page, lqw));
}
/**
* 查询合同订单列表，忽略数据权限（用于后台自定义权限处理）
* @param lqw 查询条件
* @return 合同订单信息列表
*/
private List<ErpProjectInfoVo> selectContractOrderList(MPJLambdaWrapper<ErpProjectInfo> lqw) {
return DataPermissionHelper.ignore(() -> projectInfoMapper.selectCustomErpProjectInfoVoList(lqw));
}
/**
* 查询合同订单（项目信息）
*
@ -140,7 +189,7 @@ public class ErpContractOrderServiceImpl implements IErpContractOrderService {
@Override
public TableDataInfo<ErpProjectInfoVo> queryPageList(ErpProjectInfoBo bo, PageQuery pageQuery) {
MPJLambdaWrapper<ErpProjectInfo> lqw = buildQueryWrapper(bo);
Page<ErpProjectInfoVo> result = projectInfoMapper.selectCustomErpProjectInfoVoList(pageQuery.build(), lqw);
Page<ErpProjectInfoVo> result = selectContractOrderPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
@ -154,7 +203,7 @@ public class ErpContractOrderServiceImpl implements IErpContractOrderService {
String todoOwnerType = bo.getTodoOwnerType();
bo.setManagerId(null);
MPJLambdaWrapper<ErpProjectInfo> lqw = buildQueryWrapper(bo);
List<ErpProjectInfoVo> baseList = projectInfoMapper.selectCustomErpProjectInfoVoList(lqw);
List<ErpProjectInfoVo> baseList = selectContractOrderList(lqw);
if (CollUtil.isEmpty(baseList)) {
return baseList;
}
@ -202,7 +251,7 @@ public class ErpContractOrderServiceImpl implements IErpContractOrderService {
@Override
public List<ErpProjectInfoVo> queryList(ErpProjectInfoBo bo) {
MPJLambdaWrapper<ErpProjectInfo> lqw = buildQueryWrapper(bo);
return projectInfoMapper.selectCustomErpProjectInfoVoList(lqw);
return selectContractOrderList(lqw);
}
@Override
@ -246,9 +295,9 @@ public class ErpContractOrderServiceImpl implements IErpContractOrderService {
.eq(StringUtils.isNotBlank(bo.getOrderInvoiceStatus()), ErpProjectInfo::getOrderInvoiceStatus, bo.getOrderInvoiceStatus())
.like(StringUtils.isNotBlank(bo.getContractCode()), "c.contract_code", bo.getContractCode())
.like(StringUtils.isNotBlank(bo.getContractName()), "c.contract_name", bo.getContractName())
.eq(ErpProjectInfo::getProjectCategory, ProjectCategoryConstant.CONTRACT_ORDER)
.eq("t.del_flag", "0")
.orderByDesc(ErpProjectInfo::getCreateTime);
applyContractOrderDataScope(lqw);
return lqw;
}

Write Preview
Loading…
Cancel
Save