From 01a9d85aef5ed445acdc7f68798fa19efd480e2e Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 10 九月 2024 21:57:39 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionShaServiceImpl.java | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionShaServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionShaServiceImpl.java
index b801735..c894889 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionShaServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionShaServiceImpl.java
@@ -22,7 +22,9 @@
@Slf4j
@Service
-public class ZfCollectionDownloadServiceImpl extends ServiceImpl<ZfShareMapper, ZfShare> implements ZfCollectionShareService {
+
+public class ZfCollectionShaServiceImpl extends ServiceImpl<ZfShareMapper, ZfShare> implements ZfCollectionShareService {
+
@Resource
@@ -80,7 +82,10 @@
za.setUserId(getUserId());
za.setShareContent(shareContent);
za.setShareId(shareId);
- za.setSysMenuId(2002L);
+
+ za.setSysMenuId(2018L);
+
+
addData(za);
}
}
@@ -109,8 +114,12 @@
int totalPage = (beanRecord3.size() -1) / pageSize +1;
- Page<ZfCollection> zfPropertyPage = new Page<>(pageNo, pageSize,totalPage);
- HashMap<String, Object> data = MapUtils.getShareResult(zfPropertyPage, record,beanRecord3.size());
+
+ Page<ZfCollection> zfCollectionPage = new Page<>(pageNo, pageSize,totalPage);
+ HashMap<String, Object> data = MapUtils.getShareResult(zfCollectionPage, record,beanRecord3.size());
+
+
+
return AjaxResult.success(data);
}
@@ -139,7 +148,10 @@
HashMap<Long,List<ZfCollection>> bs = new HashMap<>();
LambdaQueryWrapper<ZfShare> lqw = new LambdaQueryWrapper<>();
lqw.eq(ZfShare::getShareId,getUserId());
- lqw.eq(ZfShare::getSysMenuId,2002L);
+
+ lqw.eq(ZfShare::getSysMenuId,2018L);
+
+
List<ZfShare> beanRecords = list(lqw);
List<ZfCollection> b1 = new ArrayList<>();
for (ZfShare beanRecord : beanRecords ) {
@@ -155,7 +167,9 @@
List<ZfCollection> bs = new ArrayList<>();
LambdaQueryWrapper<ZfShare> lqw = new LambdaQueryWrapper<>();
lqw.eq(ZfShare::getShareId,getUserId());
- lqw.eq(ZfShare::getSysMenuId,2002L);
+
+ lqw.eq(ZfShare::getSysMenuId,2018L);
+
List<ZfShare> beanRecords = list(lqw);
for (ZfShare beanRecord : beanRecords ) {
ZfCollection bs2 = zfCollectionService.getById(beanRecord.getShareContent());
@@ -167,7 +181,10 @@
int totalPage = (bs.size() -1) / pageSize +1;
- Page<ZfProperty> zfCollectionPage = new Page<>(pageNo, pageSize,totalPage);
+
+ Page<ZfCollection> zfCollectionPage = new Page<>(pageNo, pageSize,totalPage);
+
+
HashMap<String, Object> data = MapUtils.getShareResult(zfCollectionPage, record,bs.size());
return AjaxResult.success(data);
}
--
Gitblit v1.9.1