From c24698dacd5d43d99bbae35b430a189675a6532b Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 06 五月 2025 17:08:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorShareServiceImpl.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorShareServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorShareServiceImpl.java
index a7e0b9a..6c1927b 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorShareServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorShareServiceImpl.java
@@ -11,10 +11,7 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.domain.*;
import com.ruoyi.mapper.ZfShareMapper;
-import com.ruoyi.service.EsService;
-import com.ruoyi.service.ZInfoUserService;
-import com.ruoyi.service.ZfDoctorService;
-import com.ruoyi.service.ZfDoctorShareService;
+import com.ruoyi.service.*;
import lombok.extern.slf4j.Slf4j;
import org.elasticsearch.action.delete.DeleteRequest;
import org.elasticsearch.client.RequestOptions;
@@ -23,12 +20,12 @@
import javax.annotation.Resource;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
import static com.alibaba.druid.sql.PagerUtils.limit;
+import static com.ruoyi.constant.MenuAuthority.DOCTOR_LIST_UPDATE;
@Slf4j
@Service
@@ -45,6 +42,9 @@
@Resource
EsService esService;
+ @Resource
+ private ZfEventService zfEventService;
+
private LambdaQueryWrapper<ZfShare> uniqueCondition(ZfShare zfShare) {
LambdaQueryWrapper<ZfShare> lqw = new LambdaQueryWrapper<>();
@@ -57,12 +57,12 @@
@Override
- public List<ZfShare> getAuthority() {
+ public List<ZfShare> getByUserId() {
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
LambdaQueryWrapper<ZfShare> lqw = new LambdaQueryWrapper<>();
- lqw.eq(ZfShare::getShareId,userId);
+ lqw.eq(ZfShare::getUserId,userId);
return list(lqw);
}
--
Gitblit v1.9.1