From 33b9865bac3e9a9cf405c0b2744cc07dfa365424 Mon Sep 17 00:00:00 2001 From: "rui.zhang" Date: Thu, 5 May 2016 09:39:46 +0800 Subject: [PATCH] =?UTF-8?q?platform=20permission=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=E8=A7=92=E8=89=B2=E6=B7=BB=E5=8A=A0=20=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=B7=B2=E7=BB=8F=E5=AD=98=E5=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/lyms/platform/biz/service/ReferConfigService.java | 4 ++-- .../com/lyms/platform/operate/web/controller/RolesController.java | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ReferConfigService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ReferConfigService.java index 54f504d..4b26c94 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ReferConfigService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ReferConfigService.java @@ -29,10 +29,10 @@ public class ReferConfigService { referConfigQuery.setNeed("true"); if(null != referConfigQuery.getNeed()) { referConfigQuery.mysqlBuild((int) referConfigDao.queryCount(mongoQuery)); - mongoQuery.start(referConfigQuery.getOffset()).end(referConfigQuery.getLimit()).addOrder(Sort.Direction.DESC, "name"); + mongoQuery.start(referConfigQuery.getOffset()).end(referConfigQuery.getLimit()).addOrder(Sort.Direction.ASC, "name"); } - return referConfigDao.queryRefer(mongoQuery); + return referConfigDao.queryRefer(mongoQuery.addOrder(Sort.Direction.DESC, "createDate")); } public void addRefer(ReferValue referValue) { 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 04b2274..594108e 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 @@ -148,6 +148,7 @@ public class RolesController extends BaseController { } RolesQuery rolesQuery = new RolesQuery(); + rolesQuery.setYn(YnEnums.YES.getId()); rolesQuery.setName(name); if(0 < rolesService.queryRolesCount(rolesQuery)) { ResultUtils.buildResultAndWrite(response,ErrorCodeConstants.NAME_EXIST, "角色名称已存在"); @@ -194,6 +195,7 @@ public class RolesController extends BaseController { } RolesQuery rolesQuery = new RolesQuery(); + rolesQuery.setYn(YnEnums.YES.getId()); rolesQuery.setName(name); if(0 < rolesService.queryRolesCount(rolesQuery)) { ResultUtils.buildResultAndWrite(response, ErrorCodeConstants.NAME_EXIST, "角色名称已存在"); -- 1.8.3.1