From 0bd31eac3b8c799b9e4f4817737a1262ce90e448 Mon Sep 17 00:00:00 2001
From: ls <lslvxy@163.com>
Date: Fri, 29 Nov 2024 16:46:29 +0800
Subject: [PATCH] update

---
 docker-compose-prod.yml                                   | 2 ++
 .../modules/database/controller/ExperimentController.java | 8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml
index 0cde4e0..5c235c1 100644
--- a/docker-compose-prod.yml
+++ b/docker-compose-prod.yml
@@ -83,6 +83,8 @@ services:
     hostname: physical-web
     networks:
       - physical-boot
+    depends_on:
+      - physical-launcher
     ports:
       - "80:80"
 #  physical-crawler:
diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java
index 403e981..9e2a64f 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java
@@ -81,7 +81,9 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
             ExperimentDTO experimentDTO = ExperimentDTO.of(v);
             if (StringUtils.isNotBlank(v.getSupervisor())) {
                 SysUser user = userService.getById(v.getSupervisor());
-                experimentDTO.setSupervisorName(user.getRealname());
+                if (Objects.nonNull(user)) {
+                    experimentDTO.setSupervisorName(user.getRealname());
+                }
             }
             List<ExperimentUser> user = experimentUserService.getByExperimentId(v.getId());
             List<ExperimentUserDTO> userDTOList;
@@ -257,7 +259,9 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
         ExperimentDTO dto = ExperimentDTO.of(experiment);
         if (StringUtils.isNotBlank(dto.getSupervisor())) {
             SysUser user = userService.getById(dto.getSupervisor());
-            dto.setSupervisorName(user.getRealname());
+            if (Objects.nonNull(user)) {
+                dto.setSupervisorName(user.getRealname());
+            }
         }
         List<ExperimentUser> userList = experimentUserService.getByExperimentId(dto.getId());
         List<ExperimentUserDTO> userDTOList = new ArrayList<>();