From 4dbab0c9584c923f12c7478131f0996dbb3bb7fe Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei@zhuguifeideiMac.local>
Date: 星期一, 25 八月 2025 13:45:31 +0800
Subject: [PATCH] Merge branch 'master' of http://lanpucloud.cn:1111/r/herb
---
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryEquipmentServiceImpl.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryEquipmentServiceImpl.java b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryEquipmentServiceImpl.java
index 0f4fb91..291bfda 100755
--- a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryEquipmentServiceImpl.java
+++ b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryEquipmentServiceImpl.java
@@ -31,6 +31,8 @@
@Autowired
private RedisUtil redisUtil;
+ @Autowired
+ private DryEqpTypeServiceImpl dryEqpTypeServiceImpl;
@Override
@@ -74,7 +76,11 @@
if (dryEquipment.getEnable()!=null){
queryWrapper.lambda().eq(DryEquipment::getEnable,dryEquipment.getEnable());
}
+ queryWrapper.lambda().orderByAsc(DryEquipment::getCode);
List<DryEquipment> equipmentList = this.list(queryWrapper);
+ equipmentList.stream().forEach(item -> {
+ item.setType(dryEqpTypeServiceImpl.getById(item.getType()).getName());
+ });
return equipmentList;
}
}
--
Gitblit v1.9.3