From db7176c2367a1ab82093c42f29ac2e67435d0bd7 Mon Sep 17 00:00:00 2001 From: wanghu Date: Mon, 17 Aug 2026 11:49:20 +0800 Subject: [PATCH] =?UTF-8?q?getUserMod=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/api/LoginUserController.java | 7 ++++++- .../bschclassmanage/controller/api/UserController.java | 7 ++++++- 2 files changed, 12 insertions(+), 2 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 1286f02..9eb7c66 100644 --- a/src/main/java/com/yunhai/bschclassmanage/controller/api/LoginUserController.java +++ b/src/main/java/com/yunhai/bschclassmanage/controller/api/LoginUserController.java @@ -4,6 +4,7 @@ import com.yunhai.bschclassmanage.utils.UserContext; import com.yunhai.bschclassmanage.config.Config; import com.yunhai.platform.openapi.client.YschBaseOpenApi; +import com.yunhai.platform.utils.model.BoaGroup; import com.yunhai.platform.utils.model.BoaModule; import com.yunhai.platform.utils.model.BoaUser; import org.springframework.web.bind.annotation.CrossOrigin; @@ -15,6 +16,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; import java.util.Enumeration; import java.util.List; +import java.util.Optional; @RestController @@ -24,7 +26,10 @@ public class LoginUserController { @GetMapping("GetUserMod") public List getUserMod(BoaUser authUserWithDept) { - return YschBaseOpenApi.getUserModule(authUserWithDept.getId(),authUserWithDept.getSchool().getId()); + Integer schoolId = Optional.ofNullable(authUserWithDept.getSchool()) + .map(BoaGroup::getId) + .orElse(null); + return YschBaseOpenApi.getUserModule(authUserWithDept.getId(), schoolId); } @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 585d5e8..3e3ed48 100644 --- a/src/main/java/com/yunhai/bschclassmanage/controller/api/UserController.java +++ b/src/main/java/com/yunhai/bschclassmanage/controller/api/UserController.java @@ -4,6 +4,7 @@ import com.yunhai.bschclassmanage.utils.UserContext; import com.yunhai.bschclassmanage.config.Config; import com.yunhai.platform.openapi.client.YschBaseOpenApi; +import com.yunhai.platform.utils.model.BoaGroup; import com.yunhai.platform.utils.model.BoaModule; import com.yunhai.platform.utils.model.BoaUser; import org.springframework.web.bind.annotation.CrossOrigin; @@ -15,6 +16,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; import java.util.Enumeration; import java.util.List; +import java.util.Optional; @RestController @RequestMapping(Config.API_PATH +"/base/") @@ -23,7 +25,10 @@ public class UserController { @GetMapping("getUserMod") public List getUserMod(BoaUser authUserWithDept) { - return YschBaseOpenApi.getUserModule(authUserWithDept.getId(),authUserWithDept.getSchool().getId()); + Integer schoolId = Optional.ofNullable(authUserWithDept.getSchool()) + .map(BoaGroup::getId) + .orElse(null); + return YschBaseOpenApi.getUserModule(authUserWithDept.getId(), schoolId); } @GetMapping("getUserInfo")