From 0b9a607a966bf5be5abf828ca6d4dbff1b7f445c Mon Sep 17 00:00:00 2001
From: zhangrui <zhangrui@lymsh.com>
Date: Thu, 19 May 2016 09:31:35 +0800
Subject: [PATCH]           bug fix

---
 .../java/com/lyms/platform/permission/model/Organization.java     | 2 +-
 .../platform/permission/service/impl/OrganizationServiceImpl.java | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

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 119a138..c571d2c 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,7 +34,7 @@ public class Organization {
     private Object area;
     private Object street;
     private String foreignId;
-    private Integer orgType;        //0 公司 1 医院
+    private Integer orgType;        //-1错误 0 公司 1 医院
 
     public Integer getOrgType() {
         return orgType;
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java
index ee9fe7d..e226c4f 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java
@@ -37,7 +37,7 @@ public class OrganizationServiceImpl implements OrganizationService {
     public Organization getOrganization(Integer id) {
         Organization organization = organizationMapper.getOrganization(id);
         if(null != organization) {
-            //设置机构类型 1 医院 0 公司
+            //璁剧疆鏈烘瀯绫诲瀷 1 鍖婚櫌 0 鍏徃
             if( null != organization.getType()) {
                 if((organization.getType().equals(OrganizationTypeEnum.NY.getId()) || organization.getType().equals(OrganizationTypeEnum.FB.getId()) ||
                             organization.getType().equals(OrganizationTypeEnum.TY.getId())|| organization.getType().equals(OrganizationTypeEnum.JMQY.getId()))) {
@@ -46,7 +46,7 @@ public class OrganizationServiceImpl implements OrganizationService {
                     organization.setOrgType(0);
                 }
             } else {
-                organization.setOrgType(null);
+                organization.setOrgType(-1);
             }
         }
         return organization;
@@ -66,7 +66,7 @@ public class OrganizationServiceImpl implements OrganizationService {
         if(CollectionUtils.isNotEmpty(organizations)) {
             for(Organization organization : organizations) {
                 if(null != organization) {
-                    //设置机构类型 1 医院 0 公司
+                    //璁剧疆鏈烘瀯绫诲瀷 1 鍖婚櫌 0 鍏徃
                     if( null != organization.getType() ) {
                         if((organization.getType().equals(OrganizationTypeEnum.NY.getId()) || organization.getType().equals(OrganizationTypeEnum.FB.getId()) ||
                                 organization.getType().equals(OrganizationTypeEnum.TY.getId())|| organization.getType().equals(OrganizationTypeEnum.JMQY.getId()))) {
@@ -75,7 +75,7 @@ public class OrganizationServiceImpl implements OrganizationService {
                             organization.setOrgType(0);
                         }
                     } else {
-                        organization.setOrgType(null);
+                        organization.setOrgType(-1);
                     }
 
                 }
-- 
1.8.3.1