From 56a3097eea9eb77b3e63b7f2e5b5e0b3ec008f18 Mon Sep 17 00:00:00 2001 From: "rui.zhang" Date: Tue, 10 May 2016 15:52:39 +0800 Subject: [PATCH] bug fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 系统管理排序 按编辑时间倒序 --- .../operate/web/controller/DepartmentsController.java | 2 +- .../operate/web/controller/OrganizationController.java | 12 ++++++++++-- .../platform/operate/web/controller/RolesController.java | 5 +++-- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java index 1c4de48..47db5e2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java @@ -195,7 +195,7 @@ public class DepartmentsController extends BaseController { DepartmentsQuery departmentsQuery = new DepartmentsQuery(); departmentsQuery.setNeed("true"); - departmentsQuery.setSort("id desc"); + departmentsQuery.setSort("modified desc"); departmentsQuery.setYn(YnEnums.YES.getId()); List orgId1 = autoMatchFacade.matchOrgId(loginState.getId()); if(null!=orgId){ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java index d3fcdd2..b53cdd6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java @@ -245,7 +245,11 @@ public class OrganizationController extends BaseController { organizationQuery.setNeed("true"); organizationQuery.setPage(page); organizationQuery.setLimit(limit); - organizationQuery.setSort("province_id desc,city_id desc,area_id desc"); + if(80 < limit) { //一次请求大于80 则按树排序 + organizationQuery.setSort("province_id desc,city_id desc,area_id desc"); + } else { + organizationQuery.setSort("modified desc"); + } } BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(aId); @@ -296,7 +300,11 @@ public class OrganizationController extends BaseController { organizationQuery.setNeed("true"); organizationQuery.setPage(page); organizationQuery.setLimit(limit); - organizationQuery.setSort("province_id desc,city_id desc,area_id desc"); + if(80 < limit) { //一次请求大于80 则按树排序 + organizationQuery.setSort("province_id desc,city_id desc,area_id desc"); + } else { + organizationQuery.setSort("modified desc"); + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java index 45886b5..a5a7d32 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java @@ -255,6 +255,7 @@ public class RolesController extends BaseController { roles.setEnable(enable); roles.setRemarks(remarks); roles.setShortcode(shortCode); + roles.setModified(new Date()); rolesService.updateRoles(roles); ResultUtils.buildSuccessResultAndWrite(response); @@ -349,7 +350,7 @@ public class RolesController extends BaseController { RolesQuery rolesQuery = new RolesQuery(); rolesQuery.setNeed("true"); - rolesQuery.setSort("id desc"); + rolesQuery.setSort("modified desc"); rolesQuery.setYn(YnEnums.YES.getId()); rolesQuery.setType(1); rolesQuery.setKeyword(keyword); @@ -409,7 +410,7 @@ public class RolesController extends BaseController { RolesQuery rolesQuery = new RolesQuery(); rolesQuery.setNeed("true"); - rolesQuery.setSort("id desc"); + rolesQuery.setSort("modified desc"); rolesQuery.setYn(YnEnums.YES.getId()); rolesQuery.setType(0); rolesQuery.setKeyword(keyword); -- 1.8.3.1