From 8d9ca9f009d00214cb8d4ad8ce25ff08cc8506a4 Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期四, 09 一月 2025 13:49:23 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou --- ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/SiteController.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/SiteController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/SiteController.java index 6c02005..d228b05 100644 --- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/SiteController.java +++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/SiteController.java @@ -84,8 +84,8 @@ - return R.ok(siteService.lambdaQuery().orderByDesc(Site::getCreateTime).in(siteIds.length>0, Site::getId, siteIds).like(siteName!=null&&siteName!="", Site::getSiteName, siteName) - .eq(Site::getIsDelete, 0).orderByDesc(Site::getSort) + return R.ok(siteService.lambdaQuery().orderByDesc(Site::getSort).in(siteIds.length>0, Site::getId, siteIds).like(siteName!=null&&siteName!="", Site::getSiteName, siteName) + .eq(Site::getIsDelete, 0) .list()); } -- Gitblit v1.7.1