From 71efc259553803d77c2792ca758890332e3e49a0 Mon Sep 17 00:00:00 2001 From: daihh Date: Wed, 28 Dec 2022 18:10:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xboe/data/outside/OutSideDataServiceImpl.java | 2 +- .../java/com/xboe/school/api/PortalConsoleApi.java | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java index 9990f65b..28d215b9 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java @@ -135,7 +135,7 @@ public class OutSideDataServiceImpl implements IOutSideDataService { if(roleCode.equals("learning-admin")){ user.setAdminType(1);//默认管理员 }else if(roleCode.equals("non-default-admin")) { - user.setAdminType(1);//非默认管理员 + user.setAdminType(2);//非默认管理员 } if(roleCode.equals("teacher")){ user.setTeacher(true);//是老师 diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalConsoleApi.java b/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalConsoleApi.java index ac296821..ab4335bd 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalConsoleApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalConsoleApi.java @@ -67,11 +67,11 @@ public class PortalConsoleApi extends ApiBaseController{ return error("账号错误，无此账号"); } - UserData userData = outsideDataService.getUserInfoByUserId(null); - if(userData==null) { - log.error("通过api获取用用户信息错误【"+getCurrent().getAccountId()+"】对应的用户"); - return error("未能获取当前用户信息"); - } +// UserData userData = outsideDataService.getUserInfoByUserId(null); +// if(userData==null) { +// log.error("通过api获取用用户信息错误【"+getCurrent().getAccountId()+"】对应的用户"); +// return error("未能获取当前用户信息"); +// } User user = userService.get(getCurrent().getAccountId()); Organization org = null; @@ -123,7 +123,8 @@ public class PortalConsoleApi extends ApiBaseController{ map.put("aid",account.getId()); map.put("sysId",user.getSysId()); - map.put("adminType",userData.getAdminType());//管理员类型，1表默认管理员，2表非默认管理员，0表不是管理员 + //map.put("adminType",userData.getAdminType());//管理员类型，1表默认管理员，2表非默认管理员，0表不是管理员 + map.put("adminType",0); map.put("companyId",user.getCompanyId()); map.put("name",user.getName()); map.put("sex",user.getGender());