From 12ebbc5ebfb418bb51901a24503a24b440d5119d Mon Sep 17 00:00:00 2001
From: "rui.zhang" <zhangrui@lymsh.com>
Date: Tue, 10 May 2016 15:22:13 +0800
Subject: [PATCH]           bug fix

---
 .../service/impl/OrganizationServiceImpl.java      | 32 ++++++++++++----------
 .../web/controller/DepartmentsController.java      |  4 ++-
 2 files changed, 21 insertions(+), 15 deletions(-)

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 4fbf97b..d95e5f5 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
@@ -36,13 +36,15 @@ public class OrganizationServiceImpl implements OrganizationService {
     @Override
     public Organization getOrganization(Integer id) {
         Organization organization = organizationMapper.getOrganization(id);
-        //设置机构类型 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);
+        if(null != organization) {
+            //设置机构类型 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);
+            }
         }
         return organization;
     }
@@ -60,13 +62,15 @@ public class OrganizationServiceImpl implements OrganizationService {
         List<Organization> organizations =  organizationMapper.queryOrganization(query);
         if(CollectionUtils.isNotEmpty(organizations)) {
             for(Organization organization : organizations) {
-                //设置机构类型 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);
+                if(null != organization) {
+                    //设置机构类型 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);
+                    }
                 }
             }
         }
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 b7ae2b4..1c4de48 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
@@ -191,6 +191,8 @@ public class DepartmentsController extends   BaseController {
         page = page == null ? 1 : page;
 
         LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
+        Users users = usersService.getUsers(loginState.getId());
+
         DepartmentsQuery departmentsQuery = new DepartmentsQuery();
         departmentsQuery.setNeed("true");
         departmentsQuery.setSort("id desc");
@@ -200,7 +202,7 @@ public class DepartmentsController extends   BaseController {
             departmentsQuery.setOrgId(orgId);
         } else if (CollectionUtils.isNotEmpty(orgId1)){
             departmentsQuery.setOrgList(orgId1);
-        } else {
+        } else if(!new Integer(2).equals(users.getType())){  //涓嶆槸瓒呯骇绠＄悊鍛�
             FrontEndResult frontEndResult = new FrontEndResult();
             frontEndResult.setPageInfo(departmentsQuery.getPageInfo());
             frontEndResult.setErrorcode(ErrorCodeConstants.SUCCESS);
-- 
1.8.3.1