update

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/dal/dao/SysUserDao.java

@@ -84,5 +84,5 @@ public interface SysUserDao extends BaseDAO<Integer, SysUser> {
 	 * 保存student
 	 * @param userId
 	 */
-    void saveStudent(@Param("userId") Integer userId, @Param("lesseeOrganId") Integer lesseeOrganId);
+    void saveStudent(@Param("userId") Integer userId);
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/SysUserService.java

@@ -102,5 +102,5 @@ public interface SysUserService extends BaseService<Integer, SysUser> {
 	 * 保存student数据
 	 * @param userId
 	 */
-	void saveStudent(Integer userId,Integer lesseeOrganId);
+	void saveStudent(Integer userId);
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/SysUserServiceImpl.java

@@ -169,7 +169,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 				sysUser.setUserType("STUDENT");
 				sysUser.setOrganId(lesseeOrganId);
 				sysUserDao.insert(sysUser);
-				sysUserService.saveStudent(sysUser.getId(),lesseeOrganId);
+				sysUserService.saveStudent(sysUser.getId());
 				//添加用户现金账户
 				imFeignService.register(new ImUserModel(sysUser.getId().toString(),phone,null));
 				userFeignService.createCashAccount(sysUser.getId());
@@ -207,8 +207,8 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 	}
 
 	@Override
-	public void saveStudent(Integer userId,Integer lesseeOrganId) {
-		sysUserDao.saveStudent(userId,lesseeOrganId);
+	public void saveStudent(Integer userId) {
+		sysUserDao.saveStudent(userId);
 	}
 
 }

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

@@ -81,7 +81,7 @@
 		VALUES(#{userId},0,0,1,NOW(),NOW())
     </insert>
     <insert id="saveStudent">
-        INSERT INTO student (user_id_,subject_id_list_,create_time_,update_time_) VALUES(#{userId},#{lesseeOrganId},NOW(),NOW())
+        INSERT INTO student (user_id_,create_time_,update_time_) VALUES(#{userId},NOW(),NOW())
     </insert>
 
     <!-- 根据主键查询一条记录 -->

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentRegistrationDao.java

@@ -318,4 +318,6 @@ public interface StudentRegistrationDao extends BaseDAO<Long, StudentRegistratio
      * @return
      */
     List<String> queryStudentMusicGroup(Integer studentId);
+
+    String getSubjectIds(Integer userId);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/Student.java

@@ -28,6 +28,10 @@ public class Student {
 		this.subjectIdList = subjectIdList;
 	}
 
+	public Student(Integer userId) {
+		this.userId = userId;
+	}
+
 	public Student() {
 	}
 

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

@@ -382,7 +382,7 @@ public class StudentManageServiceImpl implements StudentManageService {
         sysUser.setImToken(register.getToken());
         teacherDao.updateUser(sysUser);
         sysUserCashAccountDao.insert(new SysUserCashAccount(userId, "CNY"));
-        studentService.upSet(new Student(userId,sysUser.getOrganId().toString()));
+        studentService.upSet(new Student(userId,studentRegistrationDao.getSubjectIds(userId)));
         return userId;
     }
 
@@ -398,7 +398,7 @@ public class StudentManageServiceImpl implements StudentManageService {
             throw new BizException("手机号已被占用");
         }
         teacherDao.updateUser(sysUser);
-        studentService.upSet(new Student(userId,sysUser.getOrganId().toString()));
+        studentService.upSet(new Student(userId,studentRegistrationDao.getSubjectIds(userId)));
         return userId;
     }
 

mec-biz/src/main/resources/config/mybatis/StudentRegistrationMapper.xml

@@ -603,4 +603,9 @@
         LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
         WHERE sr.user_id_ = #{studentId} AND sr.music_group_status_ != 'QUIT' AND mg.status_ = 'PROGRESS'
     </select>
+    <select id="getSubjectIds" resultType="java.lang.String">
+        SELECT GROUP_CONCAT(sr.subject_id_) FROM student_registration sr
+        WHERE sr.music_group_status_ != 'QUIT' AND sr.user_id_ = #{userId}
+        GROUP BY sr.user_id_
+    </select>
 </mapper>