feat(upms): 修正菜单获取更新为异步方式

pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java

@@ -40,6 +40,7 @@ import com.pig4cloud.pigx.common.core.constant.enums.MenuTypeEnum;
 import com.pig4cloud.pigx.common.core.exception.ErrorCodes;
 import com.pig4cloud.pigx.common.core.util.MsgUtils;
 import com.pig4cloud.pigx.common.core.util.R;
+import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
@@ -48,7 +49,6 @@ import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.validation.constraints.NotNull;
 import java.util.*;
 import java.util.function.Function;
 import java.util.function.Predicate;
@@ -109,10 +109,14 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
 		Long parent = parentId == null ? CommonConstants.MENU_TREE_ROOT_ID : parentId;
 
 		List<TreeNode<Long>> collect = baseMapper
-				.selectList(Wrappers.<SysMenu>lambdaQuery()
-						.like(StrUtil.isNotBlank(menuName), SysMenu::getName, menuName)
-						.eq(StrUtil.isNotBlank(type), SysMenu::getMenuType, type).orderByAsc(SysMenu::getSortOrder))
-				.stream().map(getNodeFunction()).collect(Collectors.toList());
+			.selectList(Wrappers.<SysMenu>lambdaQuery()
+				.eq(Objects.nonNull(parentId),SysMenu::getParentId, parentId)
+				.like(StrUtil.isNotBlank(menuName), SysMenu::getName, menuName)
+				.eq(StrUtil.isNotBlank(type), SysMenu::getMenuType, type)
+				.orderByAsc(SysMenu::getSortOrder))
+			.stream()
+			.map(getNodeFunction())
+			.collect(Collectors.toList());
 
 		// 模糊查询 不组装树结构 直接返回 表格方便编辑
 		if (StrUtil.isNotBlank(menuName)) {