hz/java-servers
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git synced 2025-12-11 03:46:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

提交到测试环境

Browse Source
This commit is contained in:
daihh
2023-01-03 11:09:08 +08:00
parent a43578713b
commit 85fba1a549
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
servers/boe-server-all/src/main/java/com/xboe/school/api/PortalConsoleApi.java
View File

@@ -15,6 +15,7 @@ import com.xboe.core.CurrentUser;
import com.xboe.core.IAuthorizationToken; import com.xboe.core.IAuthorizationToken;
import com.xboe.core.JsonResponse; import com.xboe.core.JsonResponse;
import com.xboe.core.api.ApiBaseController; import com.xboe.core.api.ApiBaseController;
import com.xboe.data.dto.UserData;
import com.xboe.data.outside.IOutSideDataService; import com.xboe.data.outside.IOutSideDataService;
import com.xboe.module.teacher.entity.Teacher; import com.xboe.module.teacher.entity.Teacher;
import com.xboe.module.teacher.service.ITeacherService; import com.xboe.module.teacher.service.ITeacherService;
@@ -66,11 +67,11 @@ public class PortalConsoleApi extends ApiBaseController{
return error("账号错误，无此账号"); return error("账号错误，无此账号");
} }
// UserData userData = outsideDataService.getUserInfoByUserId(null); UserData userData = outsideDataService.getUserInfoByUserId(null);
// if(userData==null) { if(userData==null) {
// log.error("通过api获取用用户信息错误【"+getCurrent().getAccountId()+"】对应的用户"); log.error("通过api获取用用户信息错误【"+getCurrent().getAccountId()+"】对应的用户");
// return error("未能获取当前用户信息"); return error("未能获取当前用户信息");
// } }
User user = userService.get(getCurrent().getAccountId()); User user = userService.get(getCurrent().getAccountId());
Organization org = null; Organization org = null;
@@ -120,8 +121,8 @@ public class PortalConsoleApi extends ApiBaseController{
map.put("aid",account.getId()); map.put("aid",account.getId());
map.put("sysId",user.getSysId()); 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("adminType",0);
map.put("companyId",user.getCompanyId()); map.put("companyId",user.getCompanyId());
map.put("name",user.getName()); map.put("name",user.getName());
map.put("sex",user.getGender()); map.put("sex",user.getGender());