From 89aca4572db6288613cc3530c879ac1616b5d6b8 Mon Sep 17 00:00:00 2001 From: zhanhong <283456800@qq.com> Date: Wed, 28 Feb 2024 00:00:23 +0800 Subject: [PATCH] 修复:CRM 合同配置不提醒,待办事项中即将到期的合同查询报错 --- yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+), 0 deletions(-) diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java index e8a8dbf..21bdb73 100644 --- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java @@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.crm.service.contract; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.lang.Assert; +import cn.hutool.core.lang.Validator; import cn.hutool.core.util.ObjUtil; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.number.MoneyUtils; @@ -345,6 +346,9 @@ public class CrmContractServiceImpl implements CrmContractService { if (config != null && Boolean.FALSE.equals(config.getNotifyEnabled())) { config = null; } + if(Validator.isNull(config)){ + return new PageResult<>(); + } } // 2. 查询分页 return contractMapper.selectPage(pageReqVO, userId, config); -- libgit2 0.21.4