diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetCurrentController.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetCurrentController.java index fed4a26..db82cb8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetCurrentController.java +++ b/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 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); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetCurrentServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetCurrentServiceImpl.java index c1e3b95..355377a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetCurrentServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetCurrentServiceImpl.java @@ -80,6 +80,8 @@ public class AssetCurrentServiceImpl extends ServiceImpl()); } List a2 = new ArrayList<>(); if(byId.getGlIp()!=null){ @@ -89,6 +91,8 @@ public class AssetCurrentServiceImpl extends ServiceImpl()); } return byId; }