zouxuan 5 years ago
parent
commit
108c5cfa96

+ 5 - 1
mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -29,6 +29,8 @@
         <result column="id_card_no_" property="idCardNo"/>
         <result column="wechat_id_" property="wechatId"/>
         <result column="is_super_admin_" property="isSuperAdmin"/>
+        <result column="current_grade_" property="currentGrade"/>
+        <result column="current_class_" property="currentClass"/>
     </resultMap>
 
     <!-- 查询条件 -->
@@ -49,7 +51,9 @@
 
     <!-- 根据主键查询一条记录 -->
     <select id="get" resultMap="SysUser">
-		SELECT * FROM sys_user WHERE id_ = #{id}
+		SELECT su.*,sr.current_class_,sr.current_grade_
+        FROM sys_user su LEFT JOIN student_registration sr ON su.id_ = sr.user_id_
+        WHERE su.id_ = #{id} LIMIT 1
 	</select>
 
     <!-- 全查询 -->

+ 0 - 3
mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentManageServiceImpl.java

@@ -235,9 +235,6 @@ public class StudentManageServiceImpl implements StudentManageService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updateUser(SysUser sysUser) {
-        if(StringUtils.isEmpty(sysUser.getCurrentClass()) || StringUtils.isEmpty(sysUser.getCurrentGrade())){
-            throw new BizException("年级班级不能为空");
-        }
         studentManageDao.updateUser(sysUser);
         StudentRegistration studentRegistration = new StudentRegistration();
         studentRegistration.setUserId(sysUser.getId());