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, "角色名称已存在");