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 b555b3b..dc23bf5 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 @@ -4,8 +4,10 @@ package com.lyms.platform.operate.web.controller; import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.base.LoginContext; +import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.utils.ResultUtils; +import com.lyms.platform.operate.web.result.FrontEndResult; import com.lyms.platform.permission.model.*; import com.lyms.platform.permission.service.*; import org.springframework.beans.factory.annotation.Autowired; @@ -185,7 +187,12 @@ public class DepartmentsController extends BaseController { departments.setOrganization(organizationService.getOrganization(departments.getOrgId())); } - ResultUtils.buildSuccessResultAndWrite(response, departmentses); + FrontEndResult frontEndResult = new FrontEndResult(); + frontEndResult.setData(departmentses); + frontEndResult.setPageInfo(departmentsQuery.getPageInfo()); + frontEndResult.setErrorcode(ErrorCodeConstants.SUCCESS); + + ResultUtils.buildSuccessResultAndWrite(response, frontEndResult); } 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 ff36c09..8240075 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 @@ -7,6 +7,7 @@ import com.lyms.platform.common.base.LoginContext; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.utils.ResultUtils; +import com.lyms.platform.operate.web.result.FrontEndResult; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.OrganizationQuery; import com.lyms.platform.permission.model.Users; @@ -197,9 +198,14 @@ public class OrganizationController extends BaseController { organizationQuery.setPage(page); organizationQuery.setLimit(limit); organizationQuery.setKeyword(keyword); - List organizations = organizationService.queryOrganization(organizationQuery); - ResultUtils.buildSuccessResultAndWrite(response, organizations); + + FrontEndResult frontEndResult = new FrontEndResult(); + frontEndResult.setData(organizations); + frontEndResult.setPageInfo(organizationQuery.getPageInfo()); + frontEndResult.setErrorcode(ErrorCodeConstants.SUCCESS); + + ResultUtils.buildSuccessResultAndWrite(response, frontEndResult); } 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 ebbd489..84401f2 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 @@ -4,10 +4,12 @@ package com.lyms.platform.operate.web.controller; import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.base.LoginContext; +import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.exception.BusinessException; import com.lyms.platform.common.utils.Assert; import com.lyms.platform.common.utils.ResultUtils; +import com.lyms.platform.operate.web.result.FrontEndResult; import com.lyms.platform.permission.model.*; import com.lyms.platform.permission.service.*; import org.apache.commons.lang.StringUtils; @@ -314,7 +316,13 @@ public class RolesController extends BaseController { rolesQuery.setLimit(limit); List roles = rolesService.queryRoles(rolesQuery); - ResultUtils.buildSuccessResultAndWrite(response, roles); + + FrontEndResult frontEndResult = new FrontEndResult(); + frontEndResult.setPageInfo(rolesQuery.getPageInfo()); + frontEndResult.setData(roles); + frontEndResult.setErrorcode(ErrorCodeConstants.SUCCESS); + + ResultUtils.buildSuccessResultAndWrite(response, frontEndResult); } @@ -342,6 +350,13 @@ public class RolesController extends BaseController { rolesQuery.setLimit(limit); List roles = rolesService.queryRoles(rolesQuery); - ResultUtils.buildSuccessResultAndWrite(response, roles); + + + FrontEndResult frontEndResult = new FrontEndResult(); + frontEndResult.setPageInfo(rolesQuery.getPageInfo()); + frontEndResult.setData(roles); + frontEndResult.setErrorcode(ErrorCodeConstants.SUCCESS); + + ResultUtils.buildSuccessResultAndWrite(response, frontEndResult); } } 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 5073a27..6d4613f 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 @@ -8,6 +8,7 @@ import com.lyms.platform.common.constants.ConstantInterface; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.utils.*; +import com.lyms.platform.operate.web.result.FrontEndResult; import com.lyms.platform.permission.model.*; import com.lyms.platform.permission.service.*; import org.apache.commons.lang.StringUtils; @@ -88,8 +89,12 @@ public class UsersController extends BaseController { user.setDepartmentses(departmentsService.getDepartments(user.getDeptId())); } + FrontEndResult frontEndResult = new FrontEndResult(); + frontEndResult.setPageInfo(usersQuery.getPageInfo()); + frontEndResult.setData(users); + frontEndResult.setErrorcode(ErrorCodeConstants.SUCCESS); - ResultUtils.buildSuccessResultAndWrite(response, users); + ResultUtils.buildSuccessResultAndWrite(response, frontEndResult); } @@ -133,8 +138,12 @@ public class UsersController extends BaseController { user.setDepartmentses(departmentsService.getDepartments(user.getDeptId())); } + FrontEndResult frontEndResult = new FrontEndResult(); + frontEndResult.setPageInfo(usersQuery.getPageInfo()); + frontEndResult.setData(users); + frontEndResult.setErrorcode(ErrorCodeConstants.SUCCESS); - ResultUtils.buildSuccessResultAndWrite(response, users); + ResultUtils.buildSuccessResultAndWrite(response, frontEndResult); } //获取用户角色信息