From 56df98ce4952239fbf7d0e99dbeb0e5c71531d6f Mon Sep 17 00:00:00 2001
From: sean.zhou <sean.zhou@dji.com>
Date: Fri, 18 Nov 2022 18:29:06 +0800
Subject: [PATCH] initial v1.3.0

---
 src/main/java/com/dji/sample/manage/service/impl/DeviceDictionaryServiceImpl.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/dji/sample/manage/service/impl/DeviceDictionaryServiceImpl.java b/src/main/java/com/dji/sample/manage/service/impl/DeviceDictionaryServiceImpl.java
index f0dbad0..a4574b7 100644
--- a/src/main/java/com/dji/sample/manage/service/impl/DeviceDictionaryServiceImpl.java
+++ b/src/main/java/com/dji/sample/manage/service/impl/DeviceDictionaryServiceImpl.java
@@ -25,16 +25,18 @@
     private IDeviceDictionaryMapper mapper;
 
     @Override
-    public Optional<DeviceDictionaryDTO> getOneDictionaryInfoByTypeSubType(Integer deviceType, Integer subType) {
-        if (deviceType == null || subType == null) {
+    public Optional<DeviceDictionaryDTO> getOneDictionaryInfoByTypeSubType(Integer domain, Integer deviceType, Integer subType) {
+        if (domain == null || deviceType == null || subType == null) {
             return Optional.empty();
         }
         return Optional.ofNullable(
                 entityConvertToDTO(
                         mapper.selectOne(
                                 new LambdaQueryWrapper<DeviceDictionaryEntity>()
+                                        .eq(DeviceDictionaryEntity::getDomain, domain)
                                         .eq(DeviceDictionaryEntity::getDeviceType, deviceType)
-                                        .eq(DeviceDictionaryEntity::getSubType, subType))));
+                                        .eq(DeviceDictionaryEntity::getSubType, subType)
+                                        .last(" limit 1 "))));
     }
 
     /**

--
Gitblit v1.9.3