From 2754ce77031d1241a8038ba5ff51a9225b587831 Mon Sep 17 00:00:00 2001
From: divenswu <divenswu@163.com>
Date: Thu, 24 Nov 2022 12:49:21 +0800
Subject: [PATCH] =?UTF-8?q?update:2.0.0=E7=89=88=E6=9C=AC,fix=20bug?=
 =?UTF-8?q?=EF=BC=8C=E5=BD=93=E8=BF=98=E6=B2=A1=E6=9C=89=E4=BB=BB=E4=BD=95?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=EF=BC=8C?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=95=B0=E6=8D=AE=E4=BC=9A=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server/service/impl/FaceSearchServiceImpl.java | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/face-search-server/src/main/java/com/visual/face/search/server/service/impl/FaceSearchServiceImpl.java b/face-search-server/src/main/java/com/visual/face/search/server/service/impl/FaceSearchServiceImpl.java
index a6fcdd8..968ffa4 100755
--- a/face-search-server/src/main/java/com/visual/face/search/server/service/impl/FaceSearchServiceImpl.java
+++ b/face-search-server/src/main/java/com/visual/face/search/server/service/impl/FaceSearchServiceImpl.java
@@ -115,11 +115,15 @@ public class FaceSearchServiceImpl extends BaseService implements FaceSearchServ
             }
         }
         //查询数据
-        List<Map<String, Object>> faceList = faceDataMapper.getByFaceIds(collection.getFaceTable(), ValueUtil.getAllFaceColumnNames(collection), new ArrayList<>(faceIds));
-        Set<String> sampleIds = faceList.stream().map(item -> MapUtils.getString(item, Constant.ColumnNameSampleId)).collect(Collectors.toSet());
-        List<Map<String, Object>> sampleList = sampleDataMapper.getBySampleIds(collection.getSampleTable(), new ArrayList<>(sampleIds));
-        Map<String, Map<String, Object>> faceMapping = ValueUtil.mapping(faceList, Constant.ColumnNameFaceId);
-        Map<String, Map<String, Object>> sampleMapping = ValueUtil.mapping(sampleList, Constant.ColumnNameSampleId);
+        Map<String, Map<String, Object>> faceMapping = new HashMap<>();
+        Map<String, Map<String, Object>> sampleMapping = new HashMap<>();
+        if(faceIds.size() > 0){
+            List<Map<String, Object>> faceList = faceDataMapper.getByFaceIds(collection.getFaceTable(), ValueUtil.getAllFaceColumnNames(collection), new ArrayList<>(faceIds));
+            Set<String> sampleIds = faceList.stream().map(item -> MapUtils.getString(item, Constant.ColumnNameSampleId)).collect(Collectors.toSet());
+            List<Map<String, Object>> sampleList = sampleDataMapper.getBySampleIds(collection.getSampleTable(), new ArrayList<>(sampleIds));
+            faceMapping = ValueUtil.mapping(faceList, Constant.ColumnNameFaceId);
+            sampleMapping = ValueUtil.mapping(sampleList, Constant.ColumnNameSampleId);
+        }
         //构造返回结果
         List<FaceSearchRepVo> vos = new ArrayList<>();
         for(int i=0; i<faceInfos.size(); i++){