From 1352ef80a0be0e180a6e9702f9cef249b6f8e692 Mon Sep 17 00:00:00 2001
From: divenswu <divenswu@163.com>
Date: Fri, 18 Mar 2022 12:47:29 +0800
Subject: [PATCH] =?UTF-8?q?update:fix=20=E7=94=B1=E4=BA=8E=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=88=9B=E5=BB=BA=E5=AF=BC=E8=87=B4=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=B8=BA=E7=A9=BA=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../search/server/domain/base/CollectVo.java    | 13 +++++++++----
 .../face/search/server/utils/ValueUtil.java     | 17 ++++++++++-------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/face-search-server/src/main/java/com/visual/face/search/server/domain/base/CollectVo.java b/face-search-server/src/main/java/com/visual/face/search/server/domain/base/CollectVo.java
index a747fea..ccd5c15 100644
--- a/face-search-server/src/main/java/com/visual/face/search/server/domain/base/CollectVo.java
+++ b/face-search-server/src/main/java/com/visual/face/search/server/domain/base/CollectVo.java
@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.Min;
+import java.util.ArrayList;
 import java.util.List;
 
 /***
@@ -33,10 +34,10 @@ public class CollectVo<ExtendsVo extends CollectVo<ExtendsVo>> extends BaseVo {
     private Integer shardsNum;
     /**自定义的样本字段**/
     @ApiModelProperty(value="自定义的样本属性字段", position = 5,required = false)
-    private List<FiledColumn> sampleColumns;
+    private List<FiledColumn> sampleColumns = new ArrayList<>();
     /**自定义的人脸字段**/
     @ApiModelProperty(value="自定义的人脸属性字段", position = 6,required = false)
-    private List<FiledColumn> faceColumns;
+    private List<FiledColumn> faceColumns = new ArrayList<>();
     /**启用binlog同步**/
     @ApiModelProperty(value="启用binlog同步。扩展字段，暂不支持该功能。", position = 7,required = false)
     private Boolean syncBinLog;
@@ -101,7 +102,9 @@ public class CollectVo<ExtendsVo extends CollectVo<ExtendsVo>> extends BaseVo {
     }
 
     public ExtendsVo setSampleColumns(List<FiledColumn> sampleColumns) {
-        this.sampleColumns = sampleColumns;
+        if(null != sampleColumns){
+            this.sampleColumns = sampleColumns;
+        }
         return (ExtendsVo) this;
     }
 
@@ -110,7 +113,9 @@ public class CollectVo<ExtendsVo extends CollectVo<ExtendsVo>> extends BaseVo {
     }
 
     public ExtendsVo setFaceColumns(List<FiledColumn> faceColumns) {
-        this.faceColumns = faceColumns;
+        if(null != faceColumns){
+            this.faceColumns = faceColumns;
+        }
         return (ExtendsVo) this;
     }
 
diff --git a/face-search-server/src/main/java/com/visual/face/search/server/utils/ValueUtil.java b/face-search-server/src/main/java/com/visual/face/search/server/utils/ValueUtil.java
index 784c97b..07568bc 100644
--- a/face-search-server/src/main/java/com/visual/face/search/server/utils/ValueUtil.java
+++ b/face-search-server/src/main/java/com/visual/face/search/server/utils/ValueUtil.java
@@ -16,24 +16,27 @@ import java.util.Map;
 public class ValueUtil {
 
     public static List<FiledColumn> getFaceColumns(Collection collection){
-        if(null != collection.getSchemaInfo() && !collection.getSchemaInfo().isEmpty()){
+        if(null != collection.getSchemaInfo() && !collection.getSchemaInfo().isEmpty()) {
             CollectRepVo collectVo = JsonUtil.toEntity(collection.getSchemaInfo(), CollectRepVo.class);
-            return collectVo.getFaceColumns();
-        }else{
-            return new ArrayList<>();
+            if (null != collectVo && null != collectVo.getFaceColumns()) {
+                return collectVo.getFaceColumns();
+            }
         }
+        return new ArrayList<>();
     }
 
     public static List<FiledColumn> getSampleColumns(Collection collection){
         if(null != collection.getSchemaInfo() && !collection.getSchemaInfo().isEmpty()){
             CollectRepVo collectVo = JsonUtil.toEntity(collection.getSchemaInfo(), CollectRepVo.class);
-            return collectVo.getSampleColumns();
-        }else{
-            return new ArrayList<>();
+            if (null != collectVo && null != collectVo.getSampleColumns()) {
+                return collectVo.getSampleColumns();
+            }
         }
+        return new ArrayList<>();
     }
 
     public static FieldKeyValues getFieldKeyValues(Map<String, Object> map , List<FiledColumn> columns){
+        columns = null != columns ? columns : new ArrayList<>();
         Map<String, String> keyMap = new HashMap<>();
         for(FiledColumn column : columns){
             for(String dataKey : map.keySet()){