From c1f5cc33b0548f6e52afe26ddde041dade91d628 Mon Sep 17 00:00:00 2001 From: zzz <1720989295@qq.com> Date: Tue, 16 Dec 2025 20:32:21 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E5=AE=89=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/bigscreen/service/impl/DpzaglServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/DpzaglServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/DpzaglServiceImpl.java index be22b42f..67685613 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/DpzaglServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/DpzaglServiceImpl.java @@ -171,7 +171,7 @@ public class DpzaglServiceImpl implements DpzaglService { // List hseTeamMeetingVos = teamMeetingService.queryList(hseTeamMeetingQueryReq); List hseTeamMeetings = teamMeetingService.getBaseMapper().selectList(new LambdaQueryWrapper().ge(HseTeamMeeting::getProjectId, bo.getProjectId())); dpznglVo.setZbhList(MapstructUtils.convert(hseTeamMeetings, HseTeamMeetingVo.class)); - dpznglVo.getZbhList().forEach(hseTeamMeetingVo -> {hseTeamMeetingVo.setCreateByName(userService.selectNicknameByIds(hseTeamMeetingVo.getCreateBy().toString()));}); + dpznglVo.getZbhList().forEach(hseTeamMeetingVo -> {if ( hseTeamMeetingVo.getCompereId() != null){hseTeamMeetingVo.setCompereName(userService.selectNicknameByIds(hseTeamMeetingVo.getCompereId().toString()));}}); return dpznglVo; } @@ -200,7 +200,7 @@ public class DpzaglServiceImpl implements DpzaglService { dpznglVo.setAqZgsl(list.stream().filter(zl -> DpEnum.ZLGDZT_ZG.getTypeValue().equals(zl.getStatus())).count()); } if (aqZgList.getRows() != null && aqZgList.getRows().size() > 0){ - aqZgList.getRows().forEach(zl ->{zl.setCorrectorName(userService.selectNicknameByIds(zl.getCorrectorId().toString()));}); + aqZgList.getRows().forEach(zl ->{if (zl.getCorrectorId() != null){zl.setCorrectorName(userService.selectNicknameByIds(zl.getCorrectorId().toString()));}}); dpznglVo.setAqZgList(aqZgList.getRows()); } @@ -234,7 +234,7 @@ public class DpzaglServiceImpl implements DpzaglService { dpznglVo.setZlZgsl(zsZl.stream().filter(zl -> DpEnum.ZLGDZT_ZG.getTypeValue().equals(zl.getInspectionStatus())).count()); } if (zlZgLists.getRows() != null && zlZgLists.getRows().size() > 0){ - zlZgLists.getRows().forEach(zl ->{zl.setCorrectorName(userService.selectNicknameByIds(zl.getCorrectorId().toString()));}); + zlZgLists.getRows().forEach(zl ->{if (zl.getCorrectorId() != null){zl.setCorrectorName(userService.selectNicknameByIds(zl.getCorrectorId().toString()));}}); dpznglVo.setZlZgList(zlZgLists.getRows()); } }