diff --git a/servers/boe-server-all/src/main/java/com/xboe/data/dto/UserData.java b/servers/boe-server-all/src/main/java/com/xboe/data/dto/UserData.java index 1a324cc4..9256def8 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/data/dto/UserData.java +++ b/servers/boe-server-all/src/main/java/com/xboe/data/dto/UserData.java @@ -44,9 +44,24 @@ public class UserData { private String orgNamePath; /** - * 用户类型,1表学员,2表教师,3表管理员 + * 用户类型,1表学员,2表教师,3表管理员 此在这只默认只表学员 */ private Integer userType; + + /** + * 表教师 是为1 + * */ + private Boolean teacher; + + /** + * 表系统管理员 是为1 + * */ + private Boolean SysAdmin; + + /** + * 表学习管理员 是为1 + * */ + private Boolean StudyAdmin; /** * 是否删除的,如果是删除的,上面所有的字段可以不提供,只提供id就可以了 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 3bc824cc..c4777813 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 @@ -113,6 +113,20 @@ public class OutSideDataServiceImpl implements IOutSideDataService { user.setName(result.get("realName").asText()); user.setOrgNamePath(result.get("orgNamePath").asText()); user.setUserType(1);//直接设置为学员 + if(result.get("roleList")!=null){ + JsonNode result1 = rootNode.get("result"); + for(JsonNode jsonNode :result1) { + if(getNodeText(jsonNode.get("code")).equals("system-admin")){ + user.setSysAdmin(true); + } + if(getNodeText(jsonNode.get("code")).equals("learning-admin")){ + user.setStudyAdmin(true); + } + if(getNodeText(jsonNode.get("code")).equals("teacher")){ + user.setTeacher(true); + } + } + } if(StringUtils.isBlank(user.getCode())) { log.error("通过接口获取当前用户信息【"+user.getId()+"】"+user.getName()+",工号为空,不能使用"); throw new RuntimeException("通过接口获取当前用户信息,工号为空,不能使用");