From b8078469753dc152e8be25bda265dbb7677c4347 Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期三, 17 四月 2024 10:19:57 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
index 6d3798c..e19b2cc 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
@@ -2,6 +2,7 @@
import com.github.yulichang.query.MPJQueryWrapper;
import com.github.yulichang.wrapper.MPJAbstractLambdaWrapper;
+import com.mes.edgstoragecage.entity.EdgStorageCage;
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;
@@ -32,10 +33,13 @@
//鑾峰彇纾ㄨ竟鍓嶇紦瀛樼悊鐗囩淇℃伅
@Override
public List<Map> getEdgStorageInfos(){
- edgStorageCageDetailsMapper.selectJoinList(Map.class,
- new MPJQueryWrapper<EdgStorageCageDetails>().selectAll(EdgStorageCageDetails.class)
- .select("a.c","a.d").leftJoin("ab a on t.id=a.id").le("a.id","1"));
- return hangzhouMesMapper.selectCachInfo();
+ List<Map> map=edgStorageCageDetailsMapper.selectJoinList(
+ Map.class,new MPJQueryWrapper<EdgStorageCage>().selectAll(EdgStorageCage.class)
+ .select("a.c","a.d")
+ .leftJoin("ab a on t.id=a.id")
+ .le("a.id","1")
+ );
+ return map;
};
@Override
--
Gitblit v1.8.0