type=null 判断
This commit is contained in:
@@ -23,8 +23,8 @@ import java.util.List;
|
|||||||
public class LoginUserController {
|
public class LoginUserController {
|
||||||
|
|
||||||
@GetMapping("GetUserMod")
|
@GetMapping("GetUserMod")
|
||||||
public List<BoaModule> getUserMod() {
|
public List<BoaModule> getUserMod(BoaUser authUserWithDept) {
|
||||||
return YschBaseOpenApi.getUserModule(UserContext.getUserId(),UserContext.getSchId());
|
return YschBaseOpenApi.getUserModule(authUserWithDept.getId(),authUserWithDept.getSchool().getId());
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping("GetUserInfo")
|
@GetMapping("GetUserInfo")
|
||||||
|
|||||||
@@ -21,9 +21,9 @@ import java.util.List;
|
|||||||
@CrossOrigin(originPatterns = {"*"}, allowCredentials = "true")
|
@CrossOrigin(originPatterns = {"*"}, allowCredentials = "true")
|
||||||
public class UserController {
|
public class UserController {
|
||||||
|
|
||||||
@GetMapping("getUserMod")
|
@GetMapping("GetUserMod")
|
||||||
public List<BoaModule> getUserMod() {
|
public List<BoaModule> getUserMod(BoaUser authUserWithDept) {
|
||||||
return YschBaseOpenApi.getUserModule(UserContext.getUserId(),UserContext.getSchId());
|
return YschBaseOpenApi.getUserModule(authUserWithDept.getId(),authUserWithDept.getSchool().getId());
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping("getUserInfo")
|
@GetMapping("getUserInfo")
|
||||||
|
|||||||
@@ -724,7 +724,7 @@ public class ComSchTreeService implements IComSchTreeService {
|
|||||||
|
|
||||||
for (BoaGroup node : treeList) {
|
for (BoaGroup node : treeList) {
|
||||||
// 如果当前节点type等于stopType,保留该节点但清空子节点
|
// 如果当前节点type等于stopType,保留该节点但清空子节点
|
||||||
if (node.getType() == stopType) {
|
if (Objects.equals(node.getType(), stopType)) {
|
||||||
// 保留该节点,但移除所有子节点(停止递归)
|
// 保留该节点,但移除所有子节点(停止递归)
|
||||||
node.setChildren(null); // 或者 node.setChildren(new ArrayList<>());
|
node.setChildren(null); // 或者 node.setChildren(new ArrayList<>());
|
||||||
result.add(node);
|
result.add(node);
|
||||||
|
|||||||
Reference in New Issue
Block a user