卡用户增加学校，班级名称

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

@@ -7,6 +7,9 @@ import com.ruoyi.common.enums.UserRegStatus;
 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.mapper.DzClassesMapper;
+import com.ruoyi.dz.mapper.DzSchoolMapper;
 import com.ruoyi.dz.service.IDzCardsService;
 import com.ruoyi.framework.web.service.SysPasswordService;
 import com.ruoyi.framework.web.service.SysPermissionService;
@@ -47,6 +50,10 @@ public class UserDetailsServiceImpl implements UserDetailsService
 
     @Autowired
     private IDzCardsService dzCardsService;
+    @Autowired
+    private DzSchoolMapper dzSchoolMapper;
+    @Autowired
+    private DzClassesMapper dzClassesMapper;
 
     @Override
     public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException
@@ -73,7 +80,14 @@ public class UserDetailsServiceImpl implements UserDetailsService
         }
         LoginCard card = new LoginCard();
         if(null != user.getCardId() && UserRegStatus.Student.equals(user.getRegStatus())) {
-            BeanUtils.copyProperties(dzCardsService.selectDzCardsByCardId(user.getCardId()), card, "password");
+            DzCards dzCards = dzCardsService.selectDzCardsByCardId(user.getCardId());
+            BeanUtils.copyProperties(dzCards, card, "password");
+            if(null != dzCards.getSchoolId()) {
+                card.setSchoolName(dzSchoolMapper.selectDzSchoolById(dzCards.getSchoolId()).getName());
+            }
+            if(null != dzCards.getClassId()) {
+                card.setClassName(dzClassesMapper.selectDzClassesByClassId(dzCards.getClassId()).getName());
+            }
         }
         LoginUser loginUser = createLoginUser(user, card);
         if(isPhoneLogin) {

ie-common/src/main/java/com/ruoyi/common/core/domain/model/LoginCard.java

@@ -18,10 +18,14 @@ public class LoginCard {
     /** 校区id */
     @ApiModelProperty(name = "学校id")
     private Long schoolId;
+    @ApiModelProperty(name = "学校名称")
+    private String schoolName;
 
     /** 校区班级ID */
     @ApiModelProperty(name = "班级ID")
     private Long classId;
+    @ApiModelProperty(name = "班级名称")
+    private String className;
 
     /** 班级/入学年份 */
     @ApiModelProperty(name = "班级/入学年份")