userclass/UserclassService
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

getUserMod 修改

Browse Source
This commit is contained in:
wanghu
2026-08-17 11:49:20 +08:00
parent 0d4b3936cb
commit db7176c236
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/yunhai/bschclassmanage/controller/api/LoginUserController.java
+6 -1
View File
@@ -4,6 +4,7 @@ import com.yunhai.bschclassmanage.utils.UserContext;
import com.yunhai.bschclassmanage.config.Config; import com.yunhai.bschclassmanage.config.Config;
import com.yunhai.platform.openapi.client.YschBaseOpenApi; 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.BoaModule;
import com.yunhai.platform.utils.model.BoaUser; import com.yunhai.platform.utils.model.BoaUser;
import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.CrossOrigin;
@@ -15,6 +16,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.List; import java.util.List;
import java.util.Optional;
@RestController @RestController
@@ -24,7 +26,10 @@ public class LoginUserController {
@GetMapping("GetUserMod") @GetMapping("GetUserMod")
public List<BoaModule> getUserMod(BoaUser authUserWithDept) { public List<BoaModule> 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") @GetMapping("GetUserInfo")
src/main/java/com/yunhai/bschclassmanage/controller/api/UserController.java
+6 -1
View File
@@ -4,6 +4,7 @@ import com.yunhai.bschclassmanage.utils.UserContext;
import com.yunhai.bschclassmanage.config.Config; import com.yunhai.bschclassmanage.config.Config;
import com.yunhai.platform.openapi.client.YschBaseOpenApi; 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.BoaModule;
import com.yunhai.platform.utils.model.BoaUser; import com.yunhai.platform.utils.model.BoaUser;
import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.CrossOrigin;
@@ -15,6 +16,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.List; import java.util.List;
import java.util.Optional;
@RestController @RestController
@RequestMapping(Config.API_PATH +"/base/") @RequestMapping(Config.API_PATH +"/base/")
@@ -23,7 +25,10 @@ public class UserController {
@GetMapping("getUserMod") @GetMapping("getUserMod")
public List<BoaModule> getUserMod(BoaUser authUserWithDept) { public List<BoaModule> 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") @GetMapping("getUserInfo")