|
|
@@ -4,6 +4,8 @@ import java.util.List;
|
|
|
import java.util.Set;
|
|
|
|
|
|
import com.ruoyi.common.enums.AccessFromType;
|
|
|
+import com.ruoyi.dz.domain.DzSubject;
|
|
|
+import com.ruoyi.dz.service.IDzSubjectService;
|
|
|
import com.ruoyi.system.service.ISysConfigService;
|
|
|
import com.ruoyi.web.service.CommService;
|
|
|
import io.swagger.annotations.Api;
|
|
|
@@ -51,9 +53,12 @@ public class SysLoginController
|
|
|
@Autowired
|
|
|
private CommService commService;
|
|
|
|
|
|
+ private final IDzSubjectService dzSubjectService;
|
|
|
+
|
|
|
private final ISysConfigService configService;
|
|
|
|
|
|
- public SysLoginController(ISysConfigService configService) {
|
|
|
+ public SysLoginController(IDzSubjectService dzSubjectService, ISysConfigService configService) {
|
|
|
+ this.dzSubjectService = dzSubjectService;
|
|
|
this.configService = configService;
|
|
|
}
|
|
|
|
|
|
@@ -92,6 +97,10 @@ public class SysLoginController
|
|
|
loginUser.setPermissions(permissions);
|
|
|
tokenService.refreshToken(loginUser);
|
|
|
}
|
|
|
+ if(null != user.getExamMajor()) {
|
|
|
+ DzSubject dzSubject = dzSubjectService.selectDzSubjectBySubjectId(user.getExamMajor().longValue());
|
|
|
+ user.setExamMajorName(null != dzSubject ? dzSubject.getSubjectName() : "");
|
|
|
+ }
|
|
|
AjaxResult ajax;
|
|
|
//H5 wechat frontApp均需要菜单
|
|
|
String type = request.getHeader("type");
|