gaoluyang
17 小时以前 4ef87a2398db569291f8aa665e4d18050e94a090
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/contract/CrmContractMapper.java
@@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.crm.dal.mysql.contract;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.LocalDateTimeUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
@@ -51,12 +52,25 @@
    }
    default PageResult<CrmContractDO> selectPage(CrmContractPageReqVO pageReqVO, Long userId, CrmContractConfigDO config) {
        return selectPage(pageReqVO, userId, config, null);
    }
    /**
     * 分页查询(带客户权限过滤)
     *
     * @param pageReqVO 查询条件
     * @param userId 用户ID
     * @param config 合同配置
     * @param permittedCustomerIds 有权限的客户ID列表(null表示不限制)
     */
    default PageResult<CrmContractDO> selectPage(CrmContractPageReqVO pageReqVO, Long userId, CrmContractConfigDO config, List<Long> permittedCustomerIds) {
        MPJLambdaWrapperX<CrmContractDO> query = new MPJLambdaWrapperX<>();
        // 拼接数据权限的查询条件
        CrmPermissionUtils.appendPermissionCondition(query, CrmBizTypeEnum.CRM_CONTRACT.getType(),
                CrmContractDO::getId, userId, pageReqVO.getSceneType());
        // 拼接自身的查询条件
        query.selectAll(CrmContractDO.class)
                .inIfPresent(CrmContractDO::getId, pageReqVO.getIds())
                .likeIfPresent(CrmContractDO::getNo, pageReqVO.getNo())
                .likeIfPresent(CrmContractDO::getName, pageReqVO.getName())
                .eqIfPresent(CrmContractDO::getCustomerId, pageReqVO.getCustomerId())
@@ -64,6 +78,14 @@
                .eqIfPresent(CrmContractDO::getAuditStatus, pageReqVO.getAuditStatus())
                .orderByDesc(CrmContractDO::getId);
        // 客户权限过滤
        if (permittedCustomerIds != null) {
            if (CollUtil.isEmpty(permittedCustomerIds)) {
                return PageResult.empty();
            }
            query.in(CrmContractDO::getCustomerId, permittedCustomerIds);
        }
        // Backlog: 即将到期的合同
        LocalDateTime beginOfToday = LocalDateTimeUtil.beginOfDay(LocalDateTime.now());
        LocalDateTime endOfToday = LocalDateTimeUtil.endOfDay(LocalDateTime.now());