From e4eaabefaaa2ca95f809c47a11712c3bee56e1b5 Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期四, 20 二月 2025 15:07:09 +0800
Subject: [PATCH] 修改物流信息导入模板
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java
index 5afd78e..1d124c7 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java
@@ -255,6 +255,16 @@
userIds.addAll(userList.stream().map(AppUser::getId).collect(Collectors.toList()));
}
+ List<Share> list = shareService.list();
+ if (CollectionUtils.isEmpty(list)){
+ return R.ok(Page.of(pageNum, pageSize));
+ }
+ List<Long> objectIds = list.stream().map(Share::getObjectId).distinct().collect(Collectors.toList());
+ List<AppUser> appUsers = appUserClient.listByIds(objectIds);
+ List<Long> appUserIds = appUsers.stream().filter(item -> !item.getDelFlag()).map(AppUser::getId).collect(Collectors.toList());
+ if (CollectionUtils.isEmpty(userIds)){
+ userIds = appUserIds;
+ }
Page<Share> page = shareService.lambdaQuery()
@@ -264,7 +274,6 @@
.eq(auditStatus != null, Share::getAuditStatus, auditStatus)
.in(!CollectionUtils.isEmpty(userIds),Share::getObjectId, userIds)
.eq(Share::getDelFlag, 0)
- .orderByAsc(Share::getAuditStatus)
.orderByDesc(Share::getCreateTime)
.page(Page.of(pageNum, pageSize));
for (Share record : page.getRecords()) {
--
Gitblit v1.7.1