Merge branch 'develop' into ponline

cooleshow-app/src/main/java/com/yonge/cooleshow/tenant/controller/TenantInfoController.java

@@ -227,7 +227,10 @@ public class TenantInfoController extends BaseController {
                 // 创建和修改时间
                 newSysUser.setCreateTime(LocalDateTime.now());
                 newSysUser.setUpdateTime(LocalDateTime.now());
-                newSysUser.setAvatar(sysConfigService.findConfigValue(SysConfigConstant.DEFAULT_HEARD));
+                if (StringUtils.isBlank(newSysUser.getAvatar())) {
+                    // 使用默认用户头像
+                    newSysUser.setAvatar(sysConfigService.findConfigValue(SysConfigConstant.DEFAULT_HEARD));
+                }
                 // 锁定状态
                 newSysUser.setLockFlag(0);
                 // 用户类型

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherServiceImpl.java

@@ -294,7 +294,7 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
             if (StringUtils.isNoneBlank(teacherSubmitReq.getPhone(), teacherSubmitReq.getCode())) {
                 // 验证手机验证码是否正确
                 if (!smsCodeService.verifyValidCode(teacherSubmitReq.getPhone(), teacherSubmitReq.getCode(),
-                        MessageTypeEnum.SMS_VERIFY_CODE_REGISTER.getCode())) {
+                        "REGISTER")) {
                     throw new BizException("验证码错误");
                 }
             }

cooleshow-user/user-biz/src/main/resources/config/mybatis/SysMusicCompareRecordMapper.xml

@@ -381,6 +381,7 @@
 		</if>
 		group by st.user_id_
 		ORDER BY ${sortField} ${sortType}
+		<include refid="global.limit"/>
 	</select>
 	<select id="countWeChatStudentTrainData" resultType="java.lang.Integer">
 		select COUNT(DISTINCT st.user_id_)

cooleshow-user/user-tenant/src/main/java/com/yonge/cooleshow/tenant/controller/TenantInfoController.java

@@ -228,7 +228,10 @@ public class TenantInfoController extends BaseController {
                 // 创建和修改时间
                 newSysUser.setCreateTime(LocalDateTime.now());
                 newSysUser.setUpdateTime(LocalDateTime.now());
-                newSysUser.setAvatar(sysConfigService.findConfigValue(SysConfigConstant.DEFAULT_HEARD));
+                if (StringUtils.isBlank(newSysUser.getAvatar())) {
+                    // 使用默认用户头像
+                    newSysUser.setAvatar(sysConfigService.findConfigValue(SysConfigConstant.DEFAULT_HEARD));
+                }
                 // 锁定状态
                 newSysUser.setLockFlag(0);
                 // 用户类型

cooleshow-user/user-tenant/src/main/java/com/yonge/cooleshow/tenant/controller/open/OpenStudentController.java

@@ -80,8 +80,7 @@ public class OpenStudentController extends BaseController {
         if (StringUtils.isEmpty(code)) {
             throw new BizException("验证码不能为空");
         }
-        if (!smsCodeService.verifyValidCode(student.getPhone(), code,
-                MessageTypeEnum.SMS_VERIFY_CODE_REGISTER.getCode())) {
+        if (!smsCodeService.verifyValidCode(student.getPhone(), code, "REGISTER")) {
             throw new BizException("验证码错误");
         }
         Long tenantId = student.getTenantId();