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 created = #{created,jdbcType=TIMESTAMP}, - + shortCode = #{shortCode,jdbcType=VARCHAR}, 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 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;