Merge branch 'master' into staging

src/main/java/com/edgec/browserbackend/browser/dto/IpResourceDto.java

@@ -2,6 +2,7 @@ package com.edgec.browserbackend.browser.dto;
 
 import com.edgec.browserbackend.browser.domain.*;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import org.apache.commons.collections4.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -34,10 +35,10 @@ public class IpResourceDto {
 
     private String specialLineIp;
 
-    public IpResourceDto(){
+    public IpResourceDto() {
     }
 
-    public IpResourceDto(IpResource ipResource, List<ShopDto> shopDtos, boolean useHistory){
+    public IpResourceDto(IpResource ipResource, List<ShopDto> shopDtos, boolean useHistory) {
         this.id = ipResource.getId();
         this.addr = ipResource.getAddr();
         this.vendor = ipResource.getVendor();
@@ -51,18 +52,21 @@ public class IpResourceDto {
         this.password = ipResource.getPassword();
         this.protocol = ipResource.getProtocol();
         this.specialLine = ipResource.isSpecialLine();
-        if (shopDtos != null)
+        if (CollectionUtils.isNotEmpty(shopDtos)) {
             this.bindShops = shopDtos;
-        else
+            this.bindShop = shopDtos.get(0);
+        } else {
             this.bindShops = new ArrayList<>();
+            this.bindShop = new ShopDto();
+        }
         if (useHistory)
             this.bindHistories = ipResource.getBindHistory();
         else
             this.bindHistories = new ArrayList<>();
-        this.bindShop = new ShopDto();
+
     }
 
-    public IpResourceDto(IpResource ipResource, List<ShopDto> shopDtos, boolean useHistory, SpecialLine specialLine1){
+    public IpResourceDto(IpResource ipResource, List<ShopDto> shopDtos, boolean useHistory, SpecialLine specialLine1) {
         this.id = ipResource.getId();
         this.addr = ipResource.getAddr();
         this.vendor = ipResource.getVendor();
@@ -80,16 +84,18 @@ public class IpResourceDto {
         this.proxyPort = specialLine1.getProxyPort();
         this.proxyProtocol = specialLine1.getProxyProtocol();
         this.specialLine = ipResource.isSpecialLine();
-        if (shopDtos != null)
+        if (CollectionUtils.isNotEmpty(shopDtos)) {
             this.bindShops = shopDtos;
-        else
+            this.bindShop = shopDtos.get(0);
+        } else {
             this.bindShops = new ArrayList<>();
+            this.bindShop = new ShopDto();
+        }
         this.specialLineIp = specialLine1.getIp();
         if (useHistory)
             this.bindHistories = ipResource.getBindHistory();
         else
             this.bindHistories = new ArrayList<>();
-        this.bindShop = new ShopDto();
     }
 
     public String getId() {