Merge remote-tracking branch 'origin/v26.2-jdk17springboot3-20240912' into test_jdk17

performance-api/src/main/java/com/clx/performance/vo/pc/vehiclewarn/VehicleWarnUserVO.java

@@ -9,10 +9,10 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import org.apache.commons.collections4.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
 * @Author: aiqinguo
@@ -53,7 +53,7 @@ public class VehicleWarnUserVO {
 
         List<WarnTypeItem> list = new ArrayList<>();
 
-        if(CollectionUtils.isEmpty(warnTypeList)){
+        if(Objects.isNull(warnTypeList)){
             return list;
         }
         for (VehicleWarnConfigEnum.OrderWarnType item : VehicleWarnConfigEnum.OrderWarnType.values()) {
@@ -73,7 +73,7 @@ public class VehicleWarnUserVO {
         List<Integer> warnTypeList = JSON.parseArray(warnTypeJson, Integer.class);
 
         List<WarnTypeItem> list = new ArrayList<>();
-        if(CollectionUtils.isEmpty(warnTypeList)){
+        if(Objects.isNull(warnTypeList)){
             return list;
         }
         for (VehicleWarnConfigEnum.WarnType item : VehicleWarnConfigEnum.WarnType.values()) {
@@ -93,7 +93,7 @@ public class VehicleWarnUserVO {
         List<Integer> warnTypeList = JSON.parseArray(lineWarnTypeJson, Integer.class);
 
         List<WarnTypeItem> list = new ArrayList<>();
-        if(CollectionUtils.isEmpty(warnTypeList)){
+        if(Objects.isNull(warnTypeList)){
             return list;
         }
         for (LineWarnConfigEnum.WarnType item : LineWarnConfigEnum.WarnType.values()) {