From e1a5bb8beda3b8b2c79af9faa2400feb3b5d9607 Mon Sep 17 00:00:00 2001
From: "rui.zhang" <zhangrui@lymsh.com>
Date: Fri, 6 May 2016 18:34:59 +0800
Subject: [PATCH] =?UTF-8?q?platform=20permission=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=E7=94=A8=E6=88=B7=E6=9F=A5=E8=AF=A2=20=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E8=A7=92=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/lyms/platform/permission/model/Users.java       | 2 +-
 platform-biz-service/src/main/resources/mainOrm/Organization.xml      | 2 +-
 .../java/com/lyms/platform/operate/web/facade/AutoMatchFacade.java    | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Users.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Users.java
index dcd73f1..b0923ac 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Users.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Users.java
@@ -6,7 +6,7 @@ import java.util.List;
 public class Users {
     private Integer id;
     private Integer logincenterId;
-    private Integer type;   //0 管理员 1 用户
+    private Integer type;   //0 管理员 1 用户 2超级管理员
     private Integer orgId;  //机构ID
     private Integer deptId; //部门ID
     private Integer ksId; //科室ID
diff --git a/platform-biz-service/src/main/resources/mainOrm/Organization.xml b/platform-biz-service/src/main/resources/mainOrm/Organization.xml
index cc323b4..ad2dfaa 100644
--- a/platform-biz-service/src/main/resources/mainOrm/Organization.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/Organization.xml
@@ -82,7 +82,7 @@ values (#{foreignId},#{name},#{type},#{level},#{areaManage},#{provinceId},#{city
             <if test="created != null">
                 created = #{created,jdbcType=TIMESTAMP},
             </if>
-            <if test="shortCode != null and shortCode != ''">
+            <if test="shortCode != null">
                 shortCode = #{shortCode,jdbcType=VARCHAR},
             </if>
         </set>
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AutoMatchFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AutoMatchFacade.java
index 5098496..1cc8691 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AutoMatchFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AutoMatchFacade.java
@@ -69,7 +69,7 @@ public class AutoMatchFacade {
                         data.add(users.getOrgId());
                     }
                 }
-            }  else{
+            }  else if(list.get(0).getType() == 1){
                 List<Organization> list2  =accessPermissionFacade.findAccessPerminssionByUserId(list.get(0).getId());
                 if(CollectionUtils.isNotEmpty(list2)){
                     for(Organization organization:list2){
@@ -85,6 +85,8 @@ public class AutoMatchFacade {
                         data.add(userOrganizationMaps.getOrgId());
                     }
                 }*/
+            }  else if(list.get(0).getType() == 2) {
+                return  null;
             }
         }
         return data;
-- 
1.8.3.1