Merge remote-tracking branch 'origin/online1' into online1

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_,create_time_,update_time_,service_tag_,operating_tag_) VALUES(#{userId},NOW(),NOW(),1,1)
+        INSERT INTO student (user_id_,create_time_,update_time_,service_tag_,operating_tag_) VALUES(#{userId},NOW(),NOW(),0,0)
     </insert>
 
     <!-- 根据主键查询一条记录 -->

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

@@ -164,9 +164,9 @@ public class StudentManageServiceImpl implements StudentManageService {
             Map<Integer, String> vipGroupStatus = MapUtil.convertMybatisMap(vipGroupDao.queryUserVipStatus(userIds));
 
             dataList.forEach(e -> {
-                e.setMusicGroupName(musicGroupNames.get(e.getUserId().longValue()));
+                e.setMusicGroupName(musicGroupNames.get(e.getUserId()));
                 e.setVipGroupName(vipGroupNames.get(e.getUserId()));
-                e.setMusicGroupStatus(musicGroupStatus.get(e.getUserId().longValue()));
+                e.setMusicGroupStatus(musicGroupStatus.get(e.getUserId()));
                 e.setVipGroupStatus(vipGroupStatus.get(e.getUserId()));
             });
         }