From 9e487a1435c630af55606f18b2396071138811c2 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期一, 21 四月 2025 10:28:19 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentFaultReasonController.java | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentFaultReasonController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentFaultReasonController.java index 6680dbb..6b23d3d 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentFaultReasonController.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentFaultReasonController.java @@ -22,8 +22,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.Arrays; +import java.util.List; - /** +/** * @Description: 璁惧鏁呴殰鍘熷洜缁存姢 * @Author: jeecg-boot * @Date: 2025-03-19 @@ -58,6 +59,11 @@ queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0); Page<EamEquipmentFaultReason> page = new Page<EamEquipmentFaultReason>(pageNo, pageSize); IPage<EamEquipmentFaultReason> pageList = eamEquipmentFaultReasonService.page(page, queryWrapper); + List<EamEquipmentFaultReason> records = pageList.getRecords(); + records.forEach(r ->{ + r.setText(r.getFaultName()); + r.setValue(r.getId()); + }); return Result.OK(pageList); } -- Gitblit v1.9.3