增加判空

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);

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());
+            if (projectManagerInfo != null){
-            projectInfo.setManagerPhone(projectManagerInfo.getPhone());
+                projectInfo.setManager(projectManagerInfo.getManager());
+                projectInfo.setManagerPhone(projectManagerInfo.getPhone());
+            }
         }
         //projectinfo为空说明是子项目
         if (null == projectInfo) {