list

src/main/java/com/edgec/browserbackend/browser/service/Impl/IpResourceServiceImpl.java

@@ -17,6 +17,7 @@ import com.edgec.browserbackend.browser.service.IpResourceService;
 import com.edgec.browserbackend.common.commons.error.ClientRequestException;
 import com.edgec.browserbackend.common.commons.utils.NotifyUtils;
 import com.edgec.browserbackend.common.utils.FileUtil;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
@@ -526,7 +527,7 @@ public class IpResourceServiceImpl implements IpResourceService {
         // 获取当前用户的 ip 资及未使用的 ip资源
         dealIpResourceByGroup(ipResources, notUsed, account, username, groupType);
 
-        if (notUsed != null) {
+        if (CollectionUtils.isNotEmpty(notUsed)) {
             ipResources.addAll(notUsed);
         }
 
@@ -856,9 +857,10 @@ public class IpResourceServiceImpl implements IpResourceService {
                     notUsed = ipResourceRepository.findByOwnerInAndStatusInAndIsDeletedAndBind(accountNameList, Arrays.asList(0, 2, 4, 8), false, false);
                 break;
         }
-
-        ipResourceList.addAll(ipResources);
-        notUsedList.addAll(notUsed);
+        if (CollectionUtils.isNotEmpty(ipResources))
+            ipResourceList.addAll(ipResources);
+        if (CollectionUtils.isNotEmpty(notUsed))
+            notUsedList.addAll(notUsed);
     }
 
     @NotNull