diff --git a/servers/boe-server-all/src/main/java/com/xboe/data/dto/UserOrgIds.java b/servers/boe-server-all/src/main/java/com/xboe/data/dto/UserOrgIds.java new file mode 100644 index 00000000..207084c2 --- /dev/null +++ b/servers/boe-server-all/src/main/java/com/xboe/data/dto/UserOrgIds.java @@ -0,0 +1,21 @@ +package com.xboe.data.dto; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import lombok.Data; + +@Data +public class UserOrgIds { + + /** + * 是否是超级管理员 + */ + public static final String IsSystemAdminKey="isSystemAdmin"; + + private Map permissions=new HashMap(); + + private List ids; + +} diff --git a/servers/boe-server-all/src/main/java/com/xboe/data/service/impl/DataUserSyncServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/data/service/impl/DataUserSyncServiceImpl.java index 3acc7f6d..e74fcc2e 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/data/service/impl/DataUserSyncServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/data/service/impl/DataUserSyncServiceImpl.java @@ -51,9 +51,7 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService{ if(user.getDeleted()!=null) { a.setDeleted(user.getDeleted()); } - a.setLoginName(user.getCode()); - }else { //新账户 a=new Account(); diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalLoginApi.java b/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalLoginApi.java index edd7a025..e406bd03 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalLoginApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalLoginApi.java @@ -205,6 +205,7 @@ public class PortalLoginApi extends ApiBaseController { if (StringUtil.isBlank(token)) { return wrap(JsonResponseStatus.TOKEN_NOPASS, "token error"); } + Map tokenInfo = authorizationToken.readToken(token); if (tokenInfo == null) { return wrap(JsonResponseStatus.TOKEN_NOPASS, "token error");