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 f2711bbd..aaaf11a9 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 @@ -91,6 +91,7 @@ public class PortalConsoleApi extends ApiBaseController{ map.put("aid",account.getId()); map.put("sysId",user.getSysId()); + map.put("companyId",user.getCompanyId()); map.put("name",user.getName()); map.put("sex",user.getGender()); map.put("userNo",user.getUserNo()); diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalIndexApi.java b/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalIndexApi.java index 1502130b..907d32a3 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalIndexApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalIndexApi.java @@ -1,12 +1,20 @@ package com.xboe.school.api; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; + +import javax.annotation.Resource; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; import com.xboe.common.PageList; import com.xboe.common.Pagination; +import com.xboe.core.JsonResponse; +import com.xboe.core.api.ApiBaseController; import com.xboe.module.article.entity.Article; import com.xboe.module.article.service.IArticleService; import com.xboe.module.boecase.service.ICasesService; @@ -17,30 +25,9 @@ import com.xboe.module.course.service.ICourseService; import com.xboe.module.qa.entity.Question; import com.xboe.module.qa.service.IQuestionService; import com.xboe.school.vo.CasesVo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; - -import com.xboe.account.entity.Account; -import com.xboe.account.service.IAccountService; -import com.xboe.common.utils.StringUtil; -import com.xboe.core.CurrentUser; -import com.xboe.core.IAuthorizationToken; -import com.xboe.core.JsonResponse; -import com.xboe.core.api.ApiBaseController; -import com.xboe.module.teacher.entity.Teacher; -import com.xboe.module.teacher.service.ITeacherService; -import com.xboe.system.organization.entity.Organization; -import com.xboe.system.organization.service.IOrganizationService; -import com.xboe.system.user.entity.User; -import com.xboe.system.user.service.IUserService; import lombok.extern.slf4j.Slf4j; -import javax.annotation.Resource; - /** * 门户首页接口 *