From e3bac98f092a10c0e897143bece3abbcc59469f2 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 27 Oct 2023 10:06:24 +0800
Subject: [PATCH] fix：小程序提交
---
screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
index d6ceef5..e8204e2 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
@@ -110,9 +110,10 @@
orgIds.add(orgId);
integerList.addAll(orgIds);
QueryWrapper<SpecialDeviceHistory> queryWrapper = new QueryWrapper<>();
- queryWrapper.select("mac", "name")
+ queryWrapper.select("DISTINCT mac, name").lambda();
+
//.eq("special_type", Constants.SPECIAL_DEVICE_CRUISER)
- .eq("is_delete", Constants.NOT_DELETE)
+ queryWrapper.eq("is_delete", Constants.NOT_DELETE)
.in("organization_id", integerList);
return specialDeviceHistoryService.listMaps(queryWrapper);
}
--
Gitblit v1.8.0