fix: NEZ-2302 修复未正确匹配 需删除 ASSET VSYS 问题rel-22.10.08

1 files changed, 8 insertions, 11 deletions

diff --git a/nz-admin/src/main/java/com/nis/modules/vsys/service/impl/VsysTaskServiceImpl.java b/nz-admin/src/main/java/com/nis/modules/vsys/service/impl/VsysTaskServiceImpl.java
index 62b4040b..cd0c651d 100644
--- a/nz-admin/src/main/java/com/nis/modules/vsys/service/impl/VsysTaskServiceImpl.java
+++ b/nz-admin/src/main/java/com/nis/modules/vsys/service/impl/VsysTaskServiceImpl.java
@@ -270,7 +270,7 @@ public class VsysTaskServiceImpl extends ServiceImpl<VsysTaskDao, VsysTask> impl
      * @param vsysAssetIdList
      */
     private void recordUnExecStateLog(VsysTask task, List<Integer> vsysAssetIdList) {
-        if (Tool.CollUtil.isEmpty(vsysAssetIdList)) return;
+        // if (Tool.CollUtil.isEmpty(vsysAssetIdList)) return;
 
         List<VsysResult> resultList = Tool.ListUtil.list(true);
 
@@ -299,16 +299,13 @@ public class VsysTaskServiceImpl extends ServiceImpl<VsysTaskDao, VsysTask> impl
                 resultList.addAll(updateResultLogList);
 
                 // 更新 vsys task total&assetIds = del + update
-                if (ObjectUtil.notEqual(task.getTotal(), resultList.size())) {
-                    List<Integer> realConfAssetIdList = resultList.stream().map(VsysResult::getAssetId).distinct().collect(Collectors.toList());
-                    String assetIds = StrUtil.join(StrUtil.COMMA, realConfAssetIdList);
-
-                    LambdaUpdateWrapper<VsysTask> updateWrapper = new LambdaUpdateWrapper<VsysTask>()
-                            .eq(VsysTask::getId, task.getId())
-                            .set(VsysTask::getTotal, resultList.size())
-                            .set(VsysTask::getAssetIds, assetIds);
-                    this.update(updateWrapper);
-                }
+                List<Integer> realConfAssetIdList = resultList.stream().map(VsysResult::getAssetId).distinct().collect(Collectors.toList());
+                String assetIds = StrUtil.join(StrUtil.COMMA, realConfAssetIdList);
+
+                task.setTotal(resultList.size());
+                task.setAssetIds(assetIds);
+                task.setProgress(Tool.CollUtil.isEmpty(resultList) ? 100d : 0d);
+                this.updateById(task);
                 break;
             }
             default: