diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Organization.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Organization.java index 25bb57f..729489c 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Organization.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Organization.java @@ -20,6 +20,34 @@ public class Organization { private Date created; private String shortCode; + private String levelStr; + private String typeStr; + + public String getShortCode() { + return shortCode; + } + + public String getLevelStr() { + return levelStr; + } + + public void setLevelStr(String levelStr) { + this.levelStr = levelStr; + } + + public String getTypeStr() { + return typeStr; + } + + public void setTypeStr(String typeStr) { + this.typeStr = typeStr; + } + + public void setShortCode(String shortCode) { + this.shortCode = shortCode; + } + + public Integer getId() { return id; } diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/OrganizationLevelEnum.java b/platform-common/src/main/java/com/lyms/platform/common/enums/OrganizationLevelEnum.java index 28aeb4a..fe140d9 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/OrganizationLevelEnum.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/OrganizationLevelEnum.java @@ -1,5 +1,7 @@ package com.lyms.platform.common.enums; +import java.util.HashMap; + /** * 机构级别 * Created by Zhang.Rui on 2016/4/7. @@ -34,4 +36,12 @@ public enum OrganizationLevelEnum { this.text = text; } + public static String getById(int id) { + for (OrganizationLevelEnum e : OrganizationLevelEnum.values()) { + if(e.getId().equals(id)) { + return e.getText(); + } + } + return null; + } } diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/OrganizationTypeEnum.java b/platform-common/src/main/java/com/lyms/platform/common/enums/OrganizationTypeEnum.java index 72f44da..1a38c57 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/OrganizationTypeEnum.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/OrganizationTypeEnum.java @@ -35,4 +35,12 @@ public enum OrganizationTypeEnum { this.text = text; } + public static String getById(int id) { + for (OrganizationTypeEnum e : OrganizationTypeEnum.values()) { + if(e.getId().equals(id)) { + return e.getText(); + } + } + return null; + } } 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 af5cbec..6251de8 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 @@ -5,6 +5,8 @@ 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.OrganizationLevelEnum; +import com.lyms.platform.common.enums.OrganizationTypeEnum; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.utils.ResultUtils; import com.lyms.platform.operate.web.result.FrontEndResult; @@ -219,8 +221,10 @@ public class OrganizationController extends BaseController { List organizations = organizationService.queryOrganization(organizationQuery); - - + for(Organization organization : organizations) { + organization.setTypeStr(OrganizationLevelEnum.getById(organization.getLevel())); + organization.setLevelStr(OrganizationTypeEnum.getById(organization.getType())); + } FrontEndResult frontEndResult = new FrontEndResult(); frontEndResult.setData(organizations);