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 aaa458c..ee9fe7d 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,13 +37,16 @@ public class OrganizationServiceImpl implements OrganizationService {
     public Organization getOrganization(Integer id) {
         Organization organization = organizationMapper.getOrganization(id);
         if(null != organization) {
-            //���û������� 0 ��˾ 1 ҽԺ
-            if( null != organization.getType() &&
-                    (organization.getType().equals(OrganizationTypeEnum.NY.getId()) || organization.getType().equals(OrganizationTypeEnum.FB.getId()) ||
+            //ÉèÖûú¹¹ÀàÐÍ 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()))) {
-                organization.setOrgType(1);
+                    organization.setOrgType(1);
+                } else {
+                    organization.setOrgType(0);
+                }
             } else {
-                organization.setOrgType(0);
+                organization.setOrgType(null);
             }
         }
         return organization;
@@ -63,13 +66,18 @@ public class OrganizationServiceImpl implements OrganizationService {
         if(CollectionUtils.isNotEmpty(organizations)) {
             for(Organization organization : organizations) {
                 if(null != organization) {
-                    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);
+                    //ÉèÖûú¹¹ÀàÐÍ 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()))) {
+                            organization.setOrgType(1);
+                        } else {
+                            organization.setOrgType(0);
+                        }
                     } else {
-                        organization.setOrgType(0);
+                        organization.setOrgType(null);
                     }
+
                 }
             }
         }