From d1cab4b2f2690d1331f12f0d9de78bbbf926f390 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 16 一月 2025 14:27:51 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java
index 7d3d092..68827d0 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java
@@ -109,13 +109,17 @@
PageInfo<TechnicianSubscribeVO> pageInfo = new PageInfo(pageCurr, pageSize);
List<TechnicianSubscribeVO> technicianSubscribeByUserAndShop1 = technicianSubscribeMapper.getTechnicianSubscribeByUserAndShop1(pageInfo, shopId, status, phone, name, serviceMode);
if (StringUtils.isNotEmpty(name)){
- List<AppUser> nameIds = appUserClient.getAppUserByPhone(name).getData();
- technicianSubscribeByUserAndShop1 = technicianSubscribeByUserAndShop1.stream().filter(e -> nameIds.contains(e.getAppUserId()))
+ List<AppUser> nameIds = appUserClient.getAppUserByName(name).getData();
+ List<Long> collect = nameIds.stream().map(AppUser::getId).collect(Collectors.toList());
+ if (collect.isEmpty())collect.add(-1L);
+ technicianSubscribeByUserAndShop1 = technicianSubscribeByUserAndShop1.stream().filter(e -> collect.contains(e.getAppUserId()))
.collect(Collectors.toList());
}
if (StringUtils.isNotEmpty(phone)){
List<AppUser> phoneIds = appUserClient.getAppUserByPhone(phone).getData();
- technicianSubscribeByUserAndShop1 = technicianSubscribeByUserAndShop1.stream().filter(e -> phoneIds.contains(e.getAppUserId()))
+ List<Long> collect = phoneIds.stream().map(AppUser::getId).collect(Collectors.toList());
+ if (collect.isEmpty())collect.add(-1L);
+ technicianSubscribeByUserAndShop1 = technicianSubscribeByUserAndShop1.stream().filter(e -> collect.contains(e.getAppUserId()))
.collect(Collectors.toList());
}
for (TechnicianSubscribeVO technicianSubscribeVO : technicianSubscribeByUserAndShop1) {
--
Gitblit v1.7.1