From 33a47eef5b24737a8037e52ea3e49588e7df8d52 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 16 一月 2025 11:05:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 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 93a1013..7d3d092 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
@@ -30,9 +30,11 @@
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.ZoneOffset;
+import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.Set;
+import java.util.stream.Collectors;
/**
* <p>
@@ -106,6 +108,16 @@
Integer serviceMode, Integer pageCurr, Integer pageSize) {
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()))
+ .collect(Collectors.toList());
+ }
+ if (StringUtils.isNotEmpty(phone)){
+ List<AppUser> phoneIds = appUserClient.getAppUserByPhone(phone).getData();
+ technicianSubscribeByUserAndShop1 = technicianSubscribeByUserAndShop1.stream().filter(e -> phoneIds.contains(e.getAppUserId()))
+ .collect(Collectors.toList());
+ }
for (TechnicianSubscribeVO technicianSubscribeVO : technicianSubscribeByUserAndShop1) {
AppUser appUser = appUserClient.getAppUserById(technicianSubscribeVO.getAppUserId());
technicianSubscribeVO.setUserName(appUser.getName());
--
Gitblit v1.7.1