From d93b232662d6d90f858996769a7d89ff0b4cf88c Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 14 一月 2025 16:48:08 +0800
Subject: [PATCH] 重新提交修改了个人记事本bug
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZSelfNoteServiceImpl.java | 55 +++++++++++++++++++++++++++++++------------------------
1 files changed, 31 insertions(+), 24 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZSelfNoteServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZSelfNoteServiceImpl.java
index 5fd0d2e..fadc2f0 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZSelfNoteServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZSelfNoteServiceImpl.java
@@ -72,30 +72,38 @@
return lqw;
}
+// public List<ZfShareData> getAllByShareId(ZfShareData zfShareData1){
+// SysUser user = SecurityUtils.getLoginUser().getUser();
+// Long userId = user.getUserId();
+//
+// ZfShareData zfShareData = new ZfShareData();
+// zfShareData.setUserId(userId.intValue());
+// List<ZfShareData> zfShareDataList = zfShareDataService.selectList(zfShareData);
+// zfShareData.setUserId(zfShareData1.getUserId());
+// zfShareDataList.addAll(zfShareDataService.selectList(zfShareData));
+// return zfShareDataList;
+// }
+
public List<Long> getAll(){
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
+ List<Long> allList = new ArrayList<>();
+ Long source = zfShareDataService.getSource(userId);
+ allList.add(source);
+ allList.addAll(zfShareDataService.getAllPerson(Collections.singletonList(source)));
- List<ZfShareData> shareId = zfShareDataService.getShareId(userId);
- List<ZfShareData> zfShareDataList = zfShareDataService.selectList();
+ List<Long> collect = allList.stream().distinct().collect(Collectors.toList());
+
List<Long> all = new ArrayList<>();
all.add(userId);
- if(shareId.size() >0 ) {
- if (shareId.get(0).getMasterAccount() == 0 || shareId.get(0).getMasterAccount() == userId.intValue()) {
- all.add(shareId.get(0).getUserId().longValue());
- }
- else {
- all.clear();
- all.add(0L);
- return all;
- }
- }
- if (zfShareDataList.size()>0 && (zfShareDataList.get(0).getMasterAccount() == 0 || zfShareDataList.get(0).getMasterAccount() == userId.intValue())){
- for (ZfShareData zfShareOther: zfShareDataList) {
- all.add(zfShareOther.getSharedId().longValue());
- }
- }
+ if(collect.size() > 1 ) {
+ Integer masterAccount = zfShareDataService.getByShareId(collect).get(0).getMasterAccount();
+ if (masterAccount != 0 || masterAccount != userId.intValue()) {
+ all.clear();
+ }
+ all.addAll(collect);
+ }
return all;
}
@@ -107,14 +115,13 @@
LambdaQueryWrapper<ZSelfNote> lqw = buildCondition(zSelfNote);
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
- List<ZfShareData> zfShareOtherList = zfShareDataService.selectList();
- List<ZfShareData> shareId = zfShareDataService.getShareId(userId);
- if (list(lqw).size()==0) {
+
+ List<Long> all = getAll();
+ if (all.contains(userId)) {
+ List<ZfShareData> byShareId = zfShareDataService.getByShareId(all);
Integer masterAccount = 0;
- if(zfShareOtherList.size()>0 ){
- masterAccount = zfShareOtherList.get(0).getMasterAccount();}
- if(shareId.size()>0){
- masterAccount = shareId.get(0).getMasterAccount();
+ if(byShareId.size()>0){
+ masterAccount = byShareId.get(0).getMasterAccount();
}
ZInfoUser infoBysysId = zInfoUserService.getInfoBysysId(masterAccount.longValue());
if (infoBysysId !=null)
--
Gitblit v1.9.1