From 20184e212dee96148adc983750d7199d50f07d7b Mon Sep 17 00:00:00 2001 From: yinq Date: Thu, 26 Feb 2026 16:23:16 +0800 Subject: [PATCH] =?UTF-8?q?1.0.70=20=E6=A0=B9=E6=8D=AEID=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=8F=96=E6=B6=88=E6=95=B0=E6=8D=AE=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/oa/erp/mapper/ErpProjectInfoMapper.java | 8 ++++++++ .../oa/erp/service/impl/ErpContractOrderServiceImpl.java | 2 +- .../oa/erp/service/impl/ErpProjectInfoServiceImpl.java | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/mapper/ErpProjectInfoMapper.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/mapper/ErpProjectInfoMapper.java index 53b00961..b5ab08ab 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/mapper/ErpProjectInfoMapper.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/mapper/ErpProjectInfoMapper.java @@ -44,4 +44,12 @@ public interface ErpProjectInfoMapper extends BaseMapperPlus selectCustomErpProjectInfoVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper queryWrapper); + /** + * 查询项目信息列表 + * + * @param queryWrapper 条件 + * @return 项目信息集合 + */ + public List selectCustomErpProjectInfoVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper queryWrapper, Boolean single); + } diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractOrderServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractOrderServiceImpl.java index 3bfd23b9..f0deb5f9 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractOrderServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractOrderServiceImpl.java @@ -80,7 +80,7 @@ public class ErpContractOrderServiceImpl implements IErpContractOrderService { .eq(ErpProjectInfo::getProjectId, projectId) .eq(ErpProjectInfo::getProjectCategory, ProjectCategoryConstant.CONTRACT_ORDER) .eq("t.del_flag", "0"); - List list = projectInfoMapper.selectCustomErpProjectInfoVoList(lqw); + List list = projectInfoMapper.selectCustomErpProjectInfoVoList(lqw, true); return !list.isEmpty() ? list.get(0) : null; } diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectInfoServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectInfoServiceImpl.java index 1be6b36a..2318327c 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectInfoServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectInfoServiceImpl.java @@ -70,7 +70,7 @@ public class ErpProjectInfoServiceImpl implements IErpProjectInfoService { MPJLambdaWrapper lqw = JoinWrappers.lambda(ErpProjectInfo.class) .eq(ErpProjectInfo::getProjectId, projectId) .eq("t.del_flag", "0"); - List list = baseMapper.selectCustomErpProjectInfoVoList(lqw); + List list = baseMapper.selectCustomErpProjectInfoVoList(lqw, true); return !list.isEmpty() ? list.get(0) : null; }