publish 2.0.0.rc23

springboot-role/src/main/java/com/tiesheng/role/service/CoreRoleService.java

@@ -5,6 +5,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Validator;
+import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.tiesheng.annotation.role.RoleAuthority;
@@ -72,7 +73,18 @@ public class CoreRoleService extends TsServiceBase<CoreRoleGroupMapper, CoreRole
      * @return
      */
     public List<ServiceMenuVO> menuChildrenWrap(List<CoreRoleAuthority> coreServiceMenuList, String parent) {
-        List<CoreRoleAuthority> distinctList = coreServiceMenuList.stream().distinct().collect(Collectors.toList());
+
+        HashMap<String, String> keyMaps = MapUtil.newHashMap();
+
+        List<CoreRoleAuthority> distinctList = coreServiceMenuList.stream()
+                .filter(it -> {
+                    if (keyMaps.containsKey(it.getId())) {
+                        return true;
+                    }
+                    keyMaps.put(it.getId(), it.getId());
+                    return false;
+                })
+                .collect(Collectors.toList());
 
         List<ServiceMenuVO> list = new ArrayList<>();