Merge branch 'duhanyu' of http://39.101.188.84:7000/suzhou-jichuang-lanhai/TcAssetVerificationJava into dongdingding

ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetCurrentController.java

@@ -386,6 +386,8 @@ public class AssetCurrentController extends BaseController {
                 a1.add(acomma);
             });
             byId.setGlymList(a1);
+        }else {
+            byId.setGlymList(new ArrayList<>());
         }
         List<Acomma> a2 = new ArrayList<>();
         if (byId.getGlIp() != null) {
@@ -395,6 +397,8 @@ public class AssetCurrentController extends BaseController {
                 a2.add(acomma);
             });
             byId.setGlIpList(a2);
+        }else {
+            byId.setGlIpList(new ArrayList<>());
         }
         return success(byId);
     }

ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetCurrentServiceImpl.java

@@ -80,6 +80,8 @@ public class AssetCurrentServiceImpl extends ServiceImpl<AssetCurrentMapper, Ass
                 a1.add(acomma);
             });
             byId.setGlymList(a1);
+        }else {
+            byId.setGlymList(new ArrayList<>());
         }
         List<Acomma> a2 = new ArrayList<>();
         if(byId.getGlIp()!=null){
@@ -89,6 +91,8 @@ public class AssetCurrentServiceImpl extends ServiceImpl<AssetCurrentMapper, Ass
                 a2.add(acomma);
             });
             byId.setGlIpList(a2);
+        }else {
+            byId.setGlIpList(new ArrayList<>());
         }
         return byId;
     }