|
|
@@ -7,6 +7,7 @@ import com.ruoyi.common.core.controller.BaseController;
|
|
|
import com.ruoyi.common.core.domain.AjaxResult;
|
|
|
import com.ruoyi.common.core.domain.entity.SysUser;
|
|
|
import com.ruoyi.common.core.domain.model.LoginBody;
|
|
|
+import com.ruoyi.common.core.domain.model.LoginCard;
|
|
|
import com.ruoyi.common.core.domain.model.LoginUser;
|
|
|
import com.ruoyi.common.core.page.TableDataInfo;
|
|
|
import com.ruoyi.common.enums.AccessFromType;
|
|
|
@@ -18,6 +19,8 @@ import com.ruoyi.dz.domain.DzCards;
|
|
|
import com.ruoyi.dz.domain.DzClasses;
|
|
|
import com.ruoyi.dz.domain.DzControl;
|
|
|
import com.ruoyi.dz.domain.DzSchool;
|
|
|
+import com.ruoyi.dz.mapper.DzClassesMapper;
|
|
|
+import com.ruoyi.dz.mapper.DzSchoolMapper;
|
|
|
import com.ruoyi.dz.service.IDzCardsService;
|
|
|
import com.ruoyi.dz.service.IDzClassesService;
|
|
|
import com.ruoyi.dz.service.IDzControlService;
|
|
|
@@ -58,8 +61,10 @@ public class UserController extends BaseController {
|
|
|
private final IDzCardsService dzCardsService;
|
|
|
private final IDzSchoolService dzSchoolService;
|
|
|
private final IDzClassesService dzClassesService;
|
|
|
+ private final DzSchoolMapper dzSchoolMapper;
|
|
|
+ private final DzClassesMapper dzClassesMapper;
|
|
|
|
|
|
- public UserController(IDzControlService dzControlService, SysLoginService loginService, ISysUserService userService, SysPermissionService permissionService, TokenService tokenService, CommService commService, ISysConfigService configService, IDzCardsService dzCardsService, IDzSchoolService dzSchoolService, IDzClassesService dzClassesService) {
|
|
|
+ public UserController(IDzControlService dzControlService, SysLoginService loginService, ISysUserService userService, SysPermissionService permissionService, TokenService tokenService, CommService commService, ISysConfigService configService, IDzCardsService dzCardsService, IDzSchoolService dzSchoolService, IDzClassesService dzClassesService, DzSchoolMapper dzSchoolMapper, DzClassesMapper dzClassesMapper) {
|
|
|
this.dzControlService = dzControlService;
|
|
|
this.loginService = loginService;
|
|
|
this.userService = userService;
|
|
|
@@ -70,6 +75,8 @@ public class UserController extends BaseController {
|
|
|
this.dzCardsService = dzCardsService;
|
|
|
this.dzSchoolService = dzSchoolService;
|
|
|
this.dzClassesService = dzClassesService;
|
|
|
+ this.dzSchoolMapper = dzSchoolMapper;
|
|
|
+ this.dzClassesMapper = dzClassesMapper;
|
|
|
}
|
|
|
|
|
|
@GetMapping(value = "provinces")
|
|
|
@@ -269,6 +276,15 @@ public class UserController extends BaseController {
|
|
|
dzCards.setSchoolId(user.getSchoolId());
|
|
|
dzCards.setClassId(user.getClassId());
|
|
|
dzCardsService.updateDzCards(dzCards);
|
|
|
+ LoginCard loginCard = loginUser.getCard();
|
|
|
+ if(null != user.getSchoolId() && !user.getSchoolId().equals(loginCard.getSchoolId())) {
|
|
|
+ loginCard.setSchoolId(user.getSchoolId());
|
|
|
+ loginCard.setSchoolName(dzSchoolMapper.selectDzSchoolById(user.getSchoolId()).getName());
|
|
|
+ }
|
|
|
+ if(null != user.getClassId() && !user.getClassId().equals(loginCard.getClassId())) {
|
|
|
+ loginCard.setClassId(user.getClassId());
|
|
|
+ loginCard.setClassName(dzClassesMapper.selectDzClassesByClassId(user.getClassId()).getName());
|
|
|
+ }
|
|
|
}
|
|
|
if (userService.updateUserProfile(currentUser) > 0)
|
|
|
{
|
mingfu