From 61bbf3240f6bbd2f3c55afb94b78efad349669f5 Mon Sep 17 00:00:00 2001
From: gjh <1421wake>
Date: Wed, 22 Jan 2025 14:35:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=A4=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java | 3 ++-
.../huzhou/service/impl/HuzhouProjectinfoServiceImpl.java | 6 ++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java
index 814acbb..7db264a 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java
@@ -113,6 +113,7 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl<HuzhouPlaninfofil
if(data!=null){
projectinfoMoneyMapper.updateById(huzhouProjectinfoMoney);
}else{
+ // TODO 1.校验修改 2.插入:huzhou_projectinfo_money表 3.插入:huzhou_contractinfo表
projectinfoMoneyMapper.insert(huzhouProjectinfoMoney);
}
}
@@ -127,7 +128,7 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl<HuzhouPlaninfofil
String taskName = planinfo.getTaskName();
taskName=StrUtil.trim(taskName);
String projectId = planinfoService.getById(planinfoid).getProjectId();
- // TODO 1.校验修改 2.插入:huzhou_projectinfo_money表 3.插入:huzhou_contractinfo表
+
//hasRealContractInfo(taskName, projectId);
HuzhouProjectinfo huzhouProjectinfo = projectinfoService.getById(projectId);
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java
index c41992c..d89c74f 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java
@@ -577,8 +577,10 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
HuzhouProjectinfo projectInfo = getById(id);
if (projectInfo != null){
ProjectManager projectManagerInfo = projectManagerService.getProjectManagerInfo(id);
- projectInfo.setManager(projectManagerInfo.getManager());
- projectInfo.setManagerPhone(projectManagerInfo.getPhone());
+ if (projectManagerInfo != null){
+ projectInfo.setManager(projectManagerInfo.getManager());
+ projectInfo.setManagerPhone(projectManagerInfo.getPhone());
+ }
}
//projectinfo为空说明是子项目
if (null == projectInfo) {