fix

未读消息

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/service/impl/BizAvatarServiceImpl.java

@@ -1,5 +1,6 @@
 package cn.tr.module.smart.common.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import cn.tr.core.exception.TRExcCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -36,6 +37,7 @@ public class BizAvatarServiceImpl implements IBizAvatarService {
     public List<BizAvatarDTO> selectBizAvatarList(BizAvatarQueryDTO query){
         return BizAvatarMapper.INSTANCE.convertDtoList(
                 baseRepository.selectList(new LambdaQueryWrapper<BizAvatarPO>()
+                        .eq(StrUtil.isNotBlank(query.getType()),BizAvatarPO::getType,query.getType())
                 )
         );
     };

tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/oauth2/service/CurrentUserService.java

@@ -89,7 +89,6 @@ public class CurrentUserService {
         List<SysMenuDTO> pageMenuList = tenantMenus
                 .stream()
                 .filter(menu -> !StrUtil.equals(MenuEnum.button.name(), menu.getMenuType()))
-                .filter(menu -> Boolean.TRUE.equals(menu.getVisible()))
                 .collect(Collectors.toList());
 
         Collection<SysMenuDTO> allMenus = CollectionUtil.intersection(tenantMenus, roleMenus);
@@ -102,7 +101,6 @@ public class CurrentUserService {
                 .values()
                 .stream()
                 .filter(menu -> !StrUtil.equals(MenuEnum.button.name(), menu.getMenuType()))
-                .filter(menu-> Boolean.TRUE.equals(menu.getVisible()))
                 .map(menuService::convertToRoute)
                 .collect(Collectors.toList());
     }