From e1d2b6b98aa182b6a217f164f02ccaab2c9fe31d Mon Sep 17 00:00:00 2001 From: "rui.zhang" Date: Fri, 6 May 2016 16:34:59 +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=E6=9F=A5=E8=AF=A2=20=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E8=A7=92=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/controller/DepartmentsController.java | 10 +++++----- .../lyms/platform/operate/web/controller/RolesController.java | 8 ++++++-- 2 files changed, 11 insertions(+), 7 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 7e9de8a..ef50a00 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 @@ -77,11 +77,11 @@ public class DepartmentsController extends BaseController { @TokenRequired public void addDepartments(HttpServletResponse response, @PathVariable(value = "id") Integer id, - @RequestParam(value = "pid") Integer pid, - @RequestParam(value = "name") String name, - @RequestParam(value = "orgId") Integer orgId, - @RequestParam(value = "description") String description, - @RequestParam(value = "shortCode") String shortCode) { + @RequestParam(value = "pid", required = false) Integer pid, + @RequestParam(value = "name", required = false) String name, + @RequestParam(value = "orgId", required = false) Integer orgId, + @RequestParam(value = "description", required = false) String description, + @RequestParam(value = "shortCode", required = false) String shortCode) { if (null == name || null == id) { ResultUtils.buildParameterErrorResultAndWrite(response); 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 594108e..119dfeb 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 @@ -329,7 +329,8 @@ public class RolesController extends BaseController { @RequestParam(value = "keyword",required = false) String keyword, @RequestParam(value = "page",required = false) Integer page, @RequestParam(value = "limit",required = false) Integer limit, - @RequestParam(value = "orgId", required = false) Integer orgId) { + @RequestParam(value = "orgId", required = false) Integer orgId, + @RequestParam(value = "enable", required = false) Integer enable) { limit = limit == null ? 10 : limit; page = page == null ? 1 : page; @@ -342,6 +343,7 @@ public class RolesController extends BaseController { rolesQuery.setKeyword(keyword); rolesQuery.setPage(page); rolesQuery.setLimit(limit); + rolesQuery.setEnable(enable); List roles = rolesService.queryRoles(rolesQuery); List permissionses = null; @@ -383,7 +385,8 @@ public class RolesController extends BaseController { public FrontEndResult getAdminList(HttpServletResponse response, @RequestParam(value = "keyword",required = false) String keyword, @RequestParam(value = "page",required = false) Integer page, - @RequestParam(value = "limit",required = false) Integer limit) { + @RequestParam(value = "limit",required = false) Integer limit, + @RequestParam(value = "enable",required = false) Integer enable) { limit = limit == null ? 10 : limit; page = page == null ? 1 : page; @@ -396,6 +399,7 @@ public class RolesController extends BaseController { rolesQuery.setKeyword(keyword); rolesQuery.setPage(page); rolesQuery.setLimit(limit); + rolesQuery.setEnable(enable); List roles = rolesService.queryRoles(rolesQuery); -- 1.8.3.1