From 10f65333417f064377b01a89064d2ce716603a07 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 30 八月 2024 20:19:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java
index fc39754..0385f2c 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java
@@ -1017,7 +1017,11 @@
Page<ImageResourceSecurityDetail> page = PageHelper.startPage(query.getPageNum(), query.getPageSize());
securityDetailMapper.selectImageResourceSecurityDetailList(imageResourceSecurityDetail);
- return Result.ok().data(page.getResult()).total(page.getTotal());
+ // 缁熻鏁�
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", CollectionUtils.EMPTY_COLLECTION);
+ map.put("list", page);
+ return Result.ok().data(map).total(page.getTotal());
}
}
--
Gitblit v1.8.0