优先展示在任的数据

src/main/java/com/zzsn/leaderbase/service/impl/CharacterBasicInfoServiceImpl.java

@@ -167,7 +167,7 @@ public class CharacterBasicInfoServiceImpl extends ServiceImpl<CharacterBasicInf
                     t.setHasChild(1);
                     //有关联人物且 当前为历任的，切换显示最新在任数据
                     if("历任".equals(t.getTakeOfficeStatus())){
-                        List<CharacterBasicInfo> collect = subList.stream().filter(e -> e.getUid().equals(t.getUid()) && "在任".equals(e.getTakeOfficeStatus())).collect(Collectors.toList());
+                        List<CharacterBasicInfo> collect = subList.stream().filter(e -> e.getUid().equals(t.getUid()) && "在职".equals(e.getTakeOfficeStatus())).collect(Collectors.toList());
                         if(!collect.isEmpty()){
                             collect.get(0).setHasChild(1);
                             //添加到待替换列表