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 6b62e18f..d83c0ff5 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 @@ -15,6 +15,7 @@ import com.xboe.core.CurrentUser; import com.xboe.core.IAuthorizationToken; import com.xboe.core.JsonResponse; import com.xboe.core.api.ApiBaseController; +import com.xboe.data.dto.UserData; import com.xboe.data.outside.IOutSideDataService; import com.xboe.module.teacher.entity.Teacher; import com.xboe.module.teacher.service.ITeacherService; @@ -66,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; @@ -120,8 +121,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",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());