type=null 判断

This commit is contained in:
2026-08-17 11:39:10 +08:00
parent 29195e77d4
commit 88f3c488bd
3 changed files with 6 additions and 6 deletions
@@ -23,8 +23,8 @@ import java.util.List;
public class LoginUserController {
@GetMapping("GetUserMod")
public List<BoaModule> getUserMod() {
return YschBaseOpenApi.getUserModule(UserContext.getUserId(),UserContext.getSchId());
public List<BoaModule> getUserMod(BoaUser authUserWithDept) {
return YschBaseOpenApi.getUserModule(authUserWithDept.getId(),authUserWithDept.getSchool().getId());
}
@GetMapping("GetUserInfo")
@@ -21,9 +21,9 @@ import java.util.List;
@CrossOrigin(originPatterns = {"*"}, allowCredentials = "true")
public class UserController {
@GetMapping("getUserMod")
public List<BoaModule> getUserMod() {
return YschBaseOpenApi.getUserModule(UserContext.getUserId(),UserContext.getSchId());
@GetMapping("GetUserMod")
public List<BoaModule> getUserMod(BoaUser authUserWithDept) {
return YschBaseOpenApi.getUserModule(authUserWithDept.getId(),authUserWithDept.getSchool().getId());
}
@GetMapping("getUserInfo")
@@ -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);