志愿保存科目

ie-admin/src/main/java/com/ruoyi/web/controller/front/UserController.java

@@ -286,10 +286,6 @@ public class UserController extends BaseController {
                 }
             }
         }
-        if(null != user.getExamMajor()) {
-            DzSubject dzSubject = dzSubjectService.selectDzSubjectBySubjectId(user.getExamMajor().longValue());
-            user.setExamMajorName(null != dzSubject ? dzSubject.getSubjectName() : "");
-        }
         AjaxResult ajax = AjaxResult.success(user);
         ajax.put("card", loginUser.getCard());
         ajax.put("roles", roles);

ie-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -4,8 +4,6 @@ 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;
@@ -15,7 +13,6 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysMenu;
 import com.ruoyi.common.core.domain.entity.SysUser;
@@ -53,12 +50,9 @@ public class SysLoginController
     @Autowired
     private CommService commService;
 
-    private final IDzSubjectService dzSubjectService;
-
     private final ISysConfigService configService;
 
-    public SysLoginController(IDzSubjectService dzSubjectService, ISysConfigService configService) {
-        this.dzSubjectService = dzSubjectService;
+    public SysLoginController(ISysConfigService configService) {
         this.configService = configService;
     }
 
@@ -97,10 +91,6 @@ 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");

ie-admin/src/main/java/com/ruoyi/web/service/UserDetailsServiceImpl.java

@@ -9,8 +9,10 @@ import com.ruoyi.common.exception.ErrorException;
 import com.ruoyi.common.utils.PhoneUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.dz.domain.DzCards;
+import com.ruoyi.dz.domain.DzSubject;
 import com.ruoyi.dz.mapper.DzClassesMapper;
 import com.ruoyi.dz.mapper.DzSchoolMapper;
+import com.ruoyi.dz.mapper.DzSubjectMapper;
 import com.ruoyi.dz.service.IDzCardsService;
 import com.ruoyi.enums.CardDistributeStatus;
 import com.ruoyi.enums.CardTimeStatus;
@@ -61,6 +63,8 @@ public class UserDetailsServiceImpl implements UserDetailsService
     private DzSchoolMapper dzSchoolMapper;
     @Autowired
     private DzClassesMapper dzClassesMapper;
+    @Autowired
+    private DzSubjectMapper dzSubjectMapper;
 
     @Override
     public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException
@@ -107,6 +111,10 @@ public class UserDetailsServiceImpl implements UserDetailsService
                 userService.updateUserProfile(upUser);
             }
         }
+        if(null != user.getExamMajor()) {
+            DzSubject dzSubject = dzSubjectMapper.selectDzSubjectBySubjectId(user.getExamMajor().longValue());
+            user.setExamMajorName(null != dzSubject ? dzSubject.getSubjectName() : "");
+        }
         LoginUser loginUser = createLoginUser(user, card);
         if(isPhoneLogin) {
             user.setPassword(UserConstants.LOGIN_SMS_PASS);