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 ba3bb26..956d701 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 @@ -172,6 +172,7 @@ public class DepartmentsController extends BaseController { DepartmentsQuery departmentsQuery = new DepartmentsQuery(); departmentsQuery.setNeed("true"); departmentsQuery.setSort("id desc"); + departmentsQuery.setYn(YnEnums.YES.getId()); departmentsQuery.setOrgId(orgId); departmentsQuery.setPage(page); departmentsQuery.setName(keyword); 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 cf6d0e8..92ec18e 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 @@ -192,6 +192,7 @@ public class OrganizationController extends BaseController { OrganizationQuery organizationQuery = new OrganizationQuery(); organizationQuery.setNeed("true"); organizationQuery.setSort("id desc"); + organizationQuery.setYn(YnEnums.YES.getId()); organizationQuery.setName(keyword); organizationQuery.setPage(page); organizationQuery.setLimit(limit); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PermissionsController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PermissionsController.java index 6a22421..094b758 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PermissionsController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PermissionsController.java @@ -25,6 +25,7 @@ import java.util.*; * Created by Administrator on 2015/9/28 0028. */ @Controller +@RequestMapping("/v1") public class PermissionsController extends BaseController { @Autowired @@ -49,12 +50,12 @@ public class PermissionsController extends BaseController { */ @RequestMapping(value = "/permissions", method = RequestMethod.GET) @TokenRequired - public void getPermissions(HttpServletResponse response, - @RequestParam(value = "type") Integer type, - @RequestParam(value = "page") Integer page, - @RequestParam(value = "limit") Integer limit, - @RequestParam(value = "id", required = false) Integer id) { - + public void getPermissions(HttpServletResponse response, @RequestParam(value = "type") Integer type) { + PermissionsQuery permissionsQuery = new PermissionsQuery(); + permissionsQuery.setType(type); + permissionsQuery.setYn(YnEnums.YES.getId()); + List permissionses = permissionsService.queryPermissions(permissionsQuery); + ResultUtils.buildSuccessResultAndWrite(response, permissionses); } 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 3e4a384..313c925 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 @@ -253,6 +253,7 @@ public class RolesController extends BaseController { RolesQuery rolesQuery = new RolesQuery(); rolesQuery.setNeed("true"); rolesQuery.setSort("id desc"); + rolesQuery.setYn(YnEnums.YES.getId()); rolesQuery.setType(type); rolesQuery.setName(keyword); rolesQuery.setPage(page); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java index a6dc785..1e99de1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java @@ -74,6 +74,7 @@ public class UsersController extends BaseController { UsersQuery usersQuery = new UsersQuery(); usersQuery.setNeed("true"); usersQuery.setSort("id desc"); + usersQuery.setYn(YnEnums.YES.getId()); usersQuery.setName(keyword); usersQuery.setType(type); usersQuery.setPage(page);