Merge branch 'master' of http://192.168.1.222:3000/zhoufan/zxkf_api

zxkf-api/src/main/java/api/controller/online/LinkController.java

@@ -30,8 +30,13 @@ public class LinkController extends BaseController {
     public AjaxResult getList(Link input, PageInput pageInput) {
         LambdaQueryWrapper<Link> qw = new LambdaQueryWrapper();
         qw.like(!StringHelper.isEmpty(input.getKhUser()), Link::getKhUser, input.getKhUser());
-        qw.eq(!StringHelper.isEmpty(input.getKfUser()), Link::getKfUser, input.getKfUser());
+        if(!StringHelper.isEmpty(input.getKfUser())) {
+            qw.eq(Link::getKfUser, input.getKfUser());
+        }else {
+            qw.eq(Link::getKfUser, CurrentUser().getUserName());
+        }
         qw.eq(input.getLastTime() != null , Link::getLastTime, input.getLastTime());
+        qw.orderByDesc(Link::getLastTime);
         Page<Link> page = GetPage(pageInput);
         if (page != null) {
             IPage<Link> iPage = linkService.getListPage(page, qw);