From fc543916cfac06f0cf16d018b9751417e3a119f7 Mon Sep 17 00:00:00 2001 From: zhuo <2089219845@qq.com> Date: 星期一, 26 五月 2025 10:02:02 +0800 Subject: [PATCH] 人员培训讲师生成签名 --- inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductServiceImpl.java | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductServiceImpl.java index 63619a2..2f7409b 100644 --- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductServiceImpl.java +++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductServiceImpl.java @@ -16,6 +16,7 @@ import com.ruoyi.inspect.pojo.InsProduct; import com.ruoyi.inspect.pojo.InsSample; import com.ruoyi.inspect.service.InsProductService; +import com.ruoyi.performance.pojo.AuxiliaryOutputWorkingHours; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -134,7 +135,8 @@ product.setTemplate(null); product.setStyle(null); return product; - }).collect(Collectors.toList()); + }).sorted((o1, o2) -> (o1.getSort() == null ? 0 : o1.getSort()) + - (o2.getSort() == null ? 0 : o2.getSort())).collect(Collectors.toList()); return insProducts; } -- Gitblit v1.9.3