From 15da4c4960809e3ef699a470788f2ef3fb8dc8f7 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 19 二月 2025 14:16:56 +0800
Subject: [PATCH] Merge branch 'master' into 部门重构
---
business/src/main/java/com/ycl/service/impl/ProjectInvestmentFundingServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/business/src/main/java/com/ycl/service/impl/ProjectInvestmentFundingServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectInvestmentFundingServiceImpl.java
index ff2a93b..a23d64c 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectInvestmentFundingServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectInvestmentFundingServiceImpl.java
@@ -46,6 +46,7 @@
entity.setCreateBy(userId);
entity.setUpdateBy(userId);
baseMapper.insert(entity);
+ //閬垮厤鏂板涓�涓悗閲嶅鏂板杩斿洖id缁欏墠绔垽鏂�
return Result.ok("娣诲姞鎴愬姛").data(entity.getId());
}
@@ -111,8 +112,10 @@
QueryWrapper<ProjectInvestmentFunding> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("project_id",id);
ProjectInvestmentFunding entity = baseMapper.selectOne(queryWrapper);
- Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
- ProjectInvestmentFundingVO vo = ProjectInvestmentFundingVO.getVoByEntity(entity, null);
+ ProjectInvestmentFundingVO vo =new ProjectInvestmentFundingVO();
+ if(entity!=null){
+ vo = ProjectInvestmentFundingVO.getVoByEntity(entity, null);
+ }
return Result.ok().data(vo);
}
--
Gitblit v1.8.0