From 3482b005c9b3b89b0e998d1d5c7a3646d660007e Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Fri, 28 Apr 2023 10:17:42 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E9=A1=B9=E7=9B=AE=E8=AE=BE=E7=BD=AE):=20?=
 =?UTF-8?q?=E9=A6=96=E6=AC=A1=E7=99=BB=E5=85=A5=E5=90=8E=EF=BC=8C=E5=81=B6?=
 =?UTF-8?q?=E7=8E=B0=E5=90=8E=E5=8F=B0=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1025921 --user=陈建星 [安装部署]一键安装后首次登录系统后台日志报错 https://www.tapd.cn/55049933/s/1367808
---
 .../src/main/java/io/metersphere/service/ProjectService.java   | 3 +++
 .../java/io/metersphere/service/TestCaseTemplateService.java   | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/backend/src/main/java/io/metersphere/service/ProjectService.java b/backend/src/main/java/io/metersphere/service/ProjectService.java
index a148ea03f1e8..83181100d655 100644
--- a/backend/src/main/java/io/metersphere/service/ProjectService.java
+++ b/backend/src/main/java/io/metersphere/service/ProjectService.java
@@ -1009,6 +1009,9 @@ public int getProjectBugSize(String projectId) {
     }
 
     public boolean isVersionEnable(String projectId) {
+        if (StringUtils.isBlank(projectId)) {
+            return false;
+        }
         return extProjectVersionMapper.isVersionEnable(projectId);
     }
 
diff --git a/backend/src/main/java/io/metersphere/service/TestCaseTemplateService.java b/backend/src/main/java/io/metersphere/service/TestCaseTemplateService.java
index 4e9094d9cf4d..5bbc523f9903 100644
--- a/backend/src/main/java/io/metersphere/service/TestCaseTemplateService.java
+++ b/backend/src/main/java/io/metersphere/service/TestCaseTemplateService.java
@@ -235,6 +235,9 @@ public Map<String,List<String>> getCaseLevelAndStatusMapByProjectId(String proje
 
     public TestCaseTemplateDao getTemplate(String projectId) {
         Project project = projectService.getProjectById(projectId);
+        if (project == null) {
+            return null;
+        }
         String caseTemplateId = project.getCaseTemplateId();
         TestCaseTemplateWithBLOBs caseTemplate;
         TestCaseTemplateDao caseTemplateDao = new TestCaseTemplateDao();