From c1ad8255a118764f166877495bc248964ab0c8c9 Mon Sep 17 00:00:00 2001 From: Mzaxd Date: Mon, 15 May 2023 11:43:21 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8DBug=E3=80=9069263?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复编辑页面没回显报告所属部门Bug --- .../da/report/service/impl/IReportServiceImpl.java | 13 +++++++++++++ .../mybatis/mapper/mysql/ReportManageMapper.xml | 1 - 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java index 895ae72..83229d3 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java +++ b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java @@ -16,8 +16,10 @@ import com.adc.da.report.vo.ReportQueryVo; import com.adc.da.report.vo.ReportVo; import com.adc.da.sys.dao.mysql.RoleEODao; import com.adc.da.sys.dao.mysql.UserEODao; +import com.adc.da.sys.entity.OrgEO; import com.adc.da.sys.entity.RoleEO; import com.adc.da.sys.entity.UserEO; +import com.adc.da.sys.service.OrgEOService; import com.adc.da.util.http.ResponseMessage; import com.adc.da.util.http.Result; import com.adc.da.util.utils.CollectionUtils; @@ -118,6 +120,8 @@ public class IReportServiceImpl extends ServiceImpl @Resource private UserEODao userEODao; + @Resource + private OrgEOService orgEOService; @Resource private ILogService logService; @@ -672,6 +676,15 @@ public class IReportServiceImpl extends ServiceImpl @Override public ResponseMessage reportDetail(String reportId) { ReportDetailVo reportDetailVo = reportDao.reportDetail(reportId); + //设置部门名称 + String department = reportDetailVo.getDepartment(); + String[] idArray = department.split(","); + List orgEOList = orgEOService.query().in("ID", idArray).list(); + if (CollectionUtils.isNotEmpty(orgEOList)) { + String departmentName = orgEOList.stream().map(OrgEO::getOrgName).collect(Collectors.joining(",")); + reportDetailVo.setDepartmentName(departmentName); + } + //设置标签列表 LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(ReportLabelEntity::getReportId, reportId); diff --git a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml index dfafbe6..05095f3 100644 --- a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml +++ b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml @@ -282,7 +282,6 @@ rm.keycontent AS keycontent, rm.maincontent AS maincontent, rm.department AS department, - org.org_name as departmentName, rm.`year` AS `year`, rm.fileId AS fileId, f.file_name as fileName,