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

提交修改

Browse Source
This commit is contained in:
daihh
2022-12-28 18:10:35 +08:00
parent a0a96c94a2
commit 71efc25955
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java
View File

@@ -135,7 +135,7 @@ public class OutSideDataServiceImpl implements IOutSideDataService {
if(roleCode.equals("learning-admin")){ if(roleCode.equals("learning-admin")){
user.setAdminType(1);//默认管理员 user.setAdminType(1);//默认管理员
}else if(roleCode.equals("non-default-admin")) { }else if(roleCode.equals("non-default-admin")) {
user.setAdminType(1);//非默认管理员 user.setAdminType(2);//非默认管理员
} }
if(roleCode.equals("teacher")){ if(roleCode.equals("teacher")){
user.setTeacher(true);//是老师 user.setTeacher(true);//是老师

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

@@ -67,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;
@@ -123,7 +123,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("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());