家族树列表根据代数排序-升序

ruoyi-system/src/main/java/com/ruoyi/app/service/impl/TbFamilyMemberServiceImpl.java

@@ -20,6 +20,7 @@ import com.ruoyi.app.service.ITbFamilyMemberService;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Comparator;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -208,10 +209,8 @@ public class TbFamilyMemberServiceImpl extends ServiceImpl<TbFamilyMemberMapper,
                             .like(AppMemberVo::getMobile,memberVo.getSearchValue())
             );
         }
-        if (memberVo.getGeneration() != null) {
-            // 按第几代排序 升序
-            lqw.orderByAsc(AppMemberVo::getGeneration);
-        }
+        // 按第几代排序 升序
+        lqw.orderByAsc(AppMemberVo::getGeneration);
         return baseMapper.selectFamilyTree(lqw);
     }