From 05ab6e3f69a5e73624b2573db043f5923e8f7d8b Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期四, 05 十一月 2026 14:17:19 +0800
Subject: [PATCH] fix 修复bug
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyCertificateController.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyCertificateController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyCertificateController.java
index 045c083..5ad6c65 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyCertificateController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyCertificateController.java
@@ -65,7 +65,7 @@
public CommonResult<SafetyCertificateRespVO> get(@RequestParam("id") Long id) {
var cert = certificateService.getCertificate(id);
var resp = BeanUtils.toBean(cert, SafetyCertificateRespVO.class);
- SafetyCertificateService.fillDisplayFields(cert, resp);
+ certificateService.fillDisplayFields(cert, resp);
return success(resp);
}
@@ -74,10 +74,10 @@
@PreAuthorize("@ss.hasPermission('safety:cert:query')")
public CommonResult<PageResult<SafetyCertificateRespVO>> page(@Valid SafetyCertificatePageReqVO reqVO) {
var page = certificateService.getCertificatePage(reqVO);
+ // 鎵归噺琛ュ叏鎸佽瘉浜烘渶鏂版。妗堬紙濮撳悕/宸ュ彿/閮ㄩ棬锛夛紝涓�娆℃�ф煡濂介伩鍏� N+1
+ certificateService.fillEmployeeInfo(page.getList());
var result = BeanUtils.toBean(page, SafetyCertificateRespVO.class);
- for (int i = 0; i < page.getList().size(); i++) {
- SafetyCertificateService.fillDisplayFields(page.getList().get(i), result.getList().get(i));
- }
+ certificateService.fillDisplayFieldsBatch(page.getList(), result.getList());
return success(result);
}
@@ -87,13 +87,12 @@
@PreAuthorize("@ss.hasPermission('safety:cert:query')")
public CommonResult<List<SafetyCertificateRespVO>> expiringList(
@RequestParam(value = "days", required = false) Integer days) {
- List<SafetyCertificateRespVO> list = certificateService.getExpiringCertificates(days).stream()
- .map(cert -> {
- var resp = BeanUtils.toBean(cert, SafetyCertificateRespVO.class);
- SafetyCertificateService.fillDisplayFields(cert, resp);
- return resp;
- }).toList();
- return success(list);
+ List<cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyCertificateDO> certs =
+ certificateService.getExpiringCertificates(days);
+ certificateService.fillEmployeeInfo(certs);
+ var resps = BeanUtils.toBean(certs, SafetyCertificateRespVO.class);
+ certificateService.fillDisplayFieldsBatch(certs, resps);
+ return success(resps);
}
}
--
Gitblit v1.9.3