diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetTaskController.java index 24110e3..38f1a60 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetTaskController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetTaskController.java @@ -272,6 +272,7 @@ public class AssetTaskController extends BaseController { /** * 小程序资产任务审核详情信息 * + * @param taskId 任务id * @param assetId 资产id * @return */ @@ -282,7 +283,6 @@ public class AssetTaskController extends BaseController { return AjaxResult.success(assetTaskService.minitaskSh(taskId, assetId)); } - /** * 公众号资产任务审核详情信息 * @@ -312,7 +312,6 @@ public class AssetTaskController extends BaseController { return AjaxResult.success(assetTaskService.emailtaskSh(taskId, assetId)); } - /** * 移动应用程序资产任务审核详情信息 * @@ -327,7 +326,6 @@ public class AssetTaskController extends BaseController { return AjaxResult.success(assetTaskService.apptaskSh(taskId, assetId)); } - /** * 资产核查信息 * @@ -561,16 +559,20 @@ public class AssetTaskController extends BaseController { StringBuilder a = new StringBuilder(); if (CollectionUtil.isNotEmpty(assetCurrent.getGlymList())) { assetCurrent.getGlymList().forEach(x -> { - a.append(x); - a.append(","); + if (!Objects.equals(x.getKey(), "") && x.getKey() != null) { + a.append(x.getKey()); + a.append(","); + } }); } assetCurrent.setGlym(a.toString()); StringBuilder b = new StringBuilder(); - if (CollectionUtil.isNotEmpty(assetCurrent.getGlIpList())) { - assetCurrent.getGlymList().forEach(x -> { - b.append(x); - b.append(","); + if (assetCurrent.getGlIpList() != null) { + assetCurrent.getGlIpList().forEach(x -> { + if (!Objects.equals(x.getKey(), "") && x.getKey() != null) { + b.append(x.getKey()); + b.append(","); + } }); } assetCurrent.setGlIp(b.toString());