Merge branch 'sanshuohuitang_dev' into huacheng_test

张天森

2022-09-29 4c80d2017a3b88b9ad55f28c3b87fd96eb67bcb2

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.java

@@ -1,6 +1,7 @@
package com.panzhihua.service_user.service.impl;

import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;

@@ -292,13 +293,13 @@
                    BeanUtils.copyProperties(sysMenuDO2,sysMenuVO2);
                    sysMenuVOList.add(sysMenuVO2);
                });
                sysMenuVO1.setSysMenuVOList(sysMenuVOList);
                sysMenuVO1.setSysMenuVOList(sysMenuVOList.stream().sorted(Comparator.comparing(SysMenuVO::getOrderNum)).collect(Collectors.toList()));
                menuVOS.add(sysMenuVO1);
            });
            sysMenuVO.setSysMenuVOList(menuVOS);
            sysMenuVO.setSysMenuVOList(menuVOS.stream().sorted(Comparator.comparing(SysMenuVO::getOrderNum)).collect(Collectors.toList()));
            sysMenuVOS.add(sysMenuVO);
        });
        return R.ok(sysMenuVOS);
        return R.ok(sysMenuVOS.stream().sorted(Comparator.comparing(SysMenuVO::getOrderNum)).collect(Collectors.toList()));
    }

    /**