From 8064549857d1cbfc9e7b80024f666a3b006ed3e0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 28 三月 2025 21:37:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java
index 4b712b6..9869b65 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java
@@ -1088,6 +1088,7 @@
HashMap<String, Object> map = new HashMap<>();
List<TAppUser> list = appUserService.list(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getInsertType, 1)
.isNotNull(TAppUser::getPhone)
+ .ne(TAppUser::getState,3)
.isNotNull(TAppUser::getCity));
Set<String> strings2 = new HashSet<>(list.stream().filter(e -> e.getCity().equals("[]")).collect(Collectors.groupingBy(TAppUser::getProvince)).keySet());
List<Integer> collect = list.stream().map(TAppUser::getId).collect(Collectors.toList());
@@ -1169,6 +1170,7 @@
HashMap<String, Object> map = new HashMap<>();
List<TAppUser> list = appUserService.list(new LambdaQueryWrapper<TAppUser>().in(TAppUser::getId, ids)
.isNotNull(TAppUser::getPhone)
+ .ne(TAppUser::getState,3)
.isNotNull(TAppUser::getCity));
Set<String> strings2 = new HashSet<>(list.stream().filter(e -> e.getCity().equals("[]")).collect(Collectors.groupingBy(TAppUser::getProvince)).keySet());
List<Integer> collect = list.stream().map(TAppUser::getId).collect(Collectors.toList());
@@ -1251,6 +1253,7 @@
HashMap<String, Object> map = new HashMap<>();
List<TAppUser> list = appUserService.list(new LambdaQueryWrapper<TAppUser>().in(TAppUser::getId, ids)
.isNotNull(TAppUser::getPhone)
+ .ne(TAppUser::getState,3)
.isNotNull(TAppUser::getCity));
List<Integer> collect = list.stream().map(TAppUser::getId).collect(Collectors.toList());
if (collect.size() == 0) {
--
Gitblit v1.7.1