From 88f3c488bd4e62f1283462d38f228cd3c0501e15 Mon Sep 17 00:00:00 2001 From: wanghu Date: Mon, 17 Aug 2026 11:39:10 +0800 Subject: [PATCH] =?UTF-8?q?type=3Dnull=20=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bschclassmanage/controller/api/LoginUserController.java | 4 ++-- .../bschclassmanage/controller/api/UserController.java | 6 +++--- .../bschclassmanage/service/com/ComSchTreeService.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/yunhai/bschclassmanage/controller/api/LoginUserController.java b/src/main/java/com/yunhai/bschclassmanage/controller/api/LoginUserController.java index 0400489..1286f02 100644 --- a/src/main/java/com/yunhai/bschclassmanage/controller/api/LoginUserController.java +++ b/src/main/java/com/yunhai/bschclassmanage/controller/api/LoginUserController.java @@ -23,8 +23,8 @@ import java.util.List; public class LoginUserController { @GetMapping("GetUserMod") - public List getUserMod() { - return YschBaseOpenApi.getUserModule(UserContext.getUserId(),UserContext.getSchId()); + public List getUserMod(BoaUser authUserWithDept) { + return YschBaseOpenApi.getUserModule(authUserWithDept.getId(),authUserWithDept.getSchool().getId()); } @GetMapping("GetUserInfo") diff --git a/src/main/java/com/yunhai/bschclassmanage/controller/api/UserController.java b/src/main/java/com/yunhai/bschclassmanage/controller/api/UserController.java index 341bd82..fafb636 100644 --- a/src/main/java/com/yunhai/bschclassmanage/controller/api/UserController.java +++ b/src/main/java/com/yunhai/bschclassmanage/controller/api/UserController.java @@ -21,9 +21,9 @@ import java.util.List; @CrossOrigin(originPatterns = {"*"}, allowCredentials = "true") public class UserController { - @GetMapping("getUserMod") - public List getUserMod() { - return YschBaseOpenApi.getUserModule(UserContext.getUserId(),UserContext.getSchId()); + @GetMapping("GetUserMod") + public List getUserMod(BoaUser authUserWithDept) { + return YschBaseOpenApi.getUserModule(authUserWithDept.getId(),authUserWithDept.getSchool().getId()); } @GetMapping("getUserInfo") diff --git a/src/main/java/com/yunhai/bschclassmanage/service/com/ComSchTreeService.java b/src/main/java/com/yunhai/bschclassmanage/service/com/ComSchTreeService.java index 390ec62..039a992 100644 --- a/src/main/java/com/yunhai/bschclassmanage/service/com/ComSchTreeService.java +++ b/src/main/java/com/yunhai/bschclassmanage/service/com/ComSchTreeService.java @@ -724,7 +724,7 @@ public class ComSchTreeService implements IComSchTreeService { for (BoaGroup node : treeList) { // 如果当前节点type等于stopType，保留该节点但清空子节点 - if (node.getType() == stopType) { + if (Objects.equals(node.getType(), stopType)) { // 保留该节点，但移除所有子节点（停止递归） node.setChildren(null); // 或者 node.setChildren(new ArrayList<>()); result.add(node);