From 444acbf42681fe72689aaca44a274b20729086d4 Mon Sep 17 00:00:00 2001 From: "rui.zhang" Date: Tue, 10 May 2016 11:08:38 +0800 Subject: [PATCH] =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20bug=20fix=20=20?= =?UTF-8?q?=20=20=20=E6=9C=BA=E6=9E=84=E7=B1=BB=E5=9E=8B=20=20=E6=9C=89?= =?UTF-8?q?=E5=85=AC=E5=8F=B8=20=E5=92=8C=E5=8C=BB=E9=99=A2=E4=B8=A4?= =?UTF-8?q?=E7=A7=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/permission/model/Organization.java | 9 +++++++++ .../platform/operate/web/controller/OrganizationController.java | 9 +++++++++ 2 files changed, 18 insertions(+) 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 2d157e8..119a138 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 @@ -34,6 +34,15 @@ public class Organization { private Object area; private Object street; private String foreignId; + private Integer orgType; //0 ˾ 1 ҽԺ + + public Integer getOrgType() { + return orgType; + } + + public void setOrgType(Integer orgType) { + this.orgType = orgType; + } Map departmentsMap = new HashMap<>(); 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 7e7abb3..09790fe 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 @@ -342,6 +342,15 @@ public class OrganizationController extends BaseController { organization.setStreet(CommonsHelper.convterToMap(basicConfigService.getOneBasicConfigById(organization.getStreetId()), true)); } + //设置机构类型 0 公司 1 医院 + if(null != organization.getType() && + (organization.getType().equals(OrganizationTypeEnum.NY.getId()) || organization.getType().equals(OrganizationTypeEnum.FB.getId()) || + organization.getType().equals(OrganizationTypeEnum.TY.getId())|| organization.getType().equals(OrganizationTypeEnum.JMQY.getId()))) { + organization.setOrgType(1); + } else { + organization.setOrgType(0); + } + data.add(organization); } } -- 1.8.3.1