physical3/physical-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
ls
2024-11-29 16:46:29 +08:00
parent d4b694f65e
commit 0bd31eac3b
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker-compose-prod.yml
View File

@@ -83,6 +83,8 @@ services:
hostname: physical-web hostname: physical-web
networks: networks:
- physical-boot - physical-boot
depends_on:
- physical-launcher
ports: ports:
- "80:80" - "80:80"
# physical-crawler: # physical-crawler:

8
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java
View File

@@ -81,7 +81,9 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
ExperimentDTO experimentDTO = ExperimentDTO.of(v); ExperimentDTO experimentDTO = ExperimentDTO.of(v);
if (StringUtils.isNotBlank(v.getSupervisor())) { if (StringUtils.isNotBlank(v.getSupervisor())) {
SysUser user = userService.getById(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<ExperimentUser> user = experimentUserService.getByExperimentId(v.getId());
List<ExperimentUserDTO> userDTOList; List<ExperimentUserDTO> userDTOList;
@@ -257,7 +259,9 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
ExperimentDTO dto = ExperimentDTO.of(experiment); ExperimentDTO dto = ExperimentDTO.of(experiment);
if (StringUtils.isNotBlank(dto.getSupervisor())) { if (StringUtils.isNotBlank(dto.getSupervisor())) {
SysUser user = userService.getById(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<ExperimentUser> userList = experimentUserService.getByExperimentId(dto.getId());
List<ExperimentUserDTO> userDTOList = new ArrayList<>(); List<ExperimentUserDTO> userDTOList = new ArrayList<>();