From dbf9e63407c5d0e67f4ac3efd41c16c721e79ab3 Mon Sep 17 00:00:00 2001 From: "rui.zhang" Date: Wed, 4 May 2016 15:53:49 +0800 Subject: [PATCH] =?UTF-8?q?platform=20permission=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/lyms/platform/biz/service/ReferConfigService.java | 3 ++- .../java/com/lyms/platform/operate/web/controller/RolesController.java | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) 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 8ccf0c5..54f504d 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 @@ -6,6 +6,7 @@ import com.lyms.platform.biz.param.ReferConfigQuery; import com.lyms.platform.common.dao.operator.MongoQuery; import com.lyms.platform.common.utils.SystemConfig; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; import com.lyms.platform.biz.dal.ReferConfigDao; @@ -28,7 +29,7 @@ public class ReferConfigService { referConfigQuery.setNeed("true"); if(null != referConfigQuery.getNeed()) { referConfigQuery.mysqlBuild((int) referConfigDao.queryCount(mongoQuery)); - mongoQuery.start(referConfigQuery.getOffset()).end(referConfigQuery.getLimit()); + mongoQuery.start(referConfigQuery.getOffset()).end(referConfigQuery.getLimit()).addOrder(Sort.Direction.DESC, "name"); } return referConfigDao.queryRefer(mongoQuery); 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 e26b708..04b2274 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 @@ -80,6 +80,9 @@ public class RolesController extends BaseController { String[] roleArrayIds = ids.split(","); stopWatch.start("permissionsService.getPermissions by id"); for (String tmp : roleArrayIds) { + + + Permissions permissions = permissionsService.getPermissions(Integer.valueOf(tmp)); //权限是否存在 if (permissions == null || permissions.getYn() == YnEnums.NO.getId()) { -- 1.8.3.1