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

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

@@ -270,16 +270,16 @@ public class TenantInfoController extends BaseController {
 
             // 修改用户基础信息流程
             //设置默认头像
-            if (StringUtils.isBlank(sysUser.getAvatar())) {
-                sysUser.setAvatar(sysConfigService.findConfigValue(SysConfigConstant.DEFAULT_HEARD));
+            if (StringUtils.isNotBlank(sysUser.getAvatar())) {
+                //sysUser.setAvatar(sysConfigService.findConfigValue(SysConfigConstant.DEFAULT_HEARD));
+
+                // 更新用户头象
+                com.yonge.cooleshow.biz.dal.entity.SysUser updateSysUser = new com.yonge.cooleshow.biz.dal.entity.SysUser();
+                updateSysUser.setId(user.getId());
+                updateSysUser.setAvatar(sysUser.getAvatar());
+                sysUserMapper.updateById(updateSysUser);
             }
 
-            // 更新用户头象
-            com.yonge.cooleshow.biz.dal.entity.SysUser updateSysUser = new com.yonge.cooleshow.biz.dal.entity.SysUser();
-            updateSysUser.setId(user.getId());
-            updateSysUser.setAvatar(sysUser.getAvatar());
-            sysUserMapper.updateById(updateSysUser);
-
             // 更新机构员工头像和昵称，机构信息表中的用户昵称
             tenantStaffService.lambdaUpdate()
                     .eq(TenantStaff::getUserId, user.getId())

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

@@ -190,7 +190,7 @@
 		WHERE smcr.user_id_=#{userId}  and smcr.client_id_ = #{clientId}
 		  AND DATE_FORMAT(smcr.create_time_, '%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
 		GROUP BY DATE_FORMAT(smcr.create_time_, '%Y-%m-%d')
-		ORDER BY trainDate;
+		ORDER BY trainDateStr;
 	</select>
 
 	<sql id="queryMusicGroupStudentTrainDataConditon">

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

@@ -271,16 +271,16 @@ public class TenantInfoController extends BaseController {
 
             // 修改用户基础信息流程
             //设置默认头像
-            if (StringUtils.isBlank(sysUser.getAvatar())) {
-                sysUser.setAvatar(sysConfigService.findConfigValue(SysConfigConstant.DEFAULT_HEARD));
+            if (StringUtils.isNotBlank(sysUser.getAvatar())) {
+                //sysUser.setAvatar(sysConfigService.findConfigValue(SysConfigConstant.DEFAULT_HEARD));
+
+                // 更新用户头象
+                com.yonge.cooleshow.biz.dal.entity.SysUser updateSysUser = new com.yonge.cooleshow.biz.dal.entity.SysUser();
+                updateSysUser.setId(user.getId());
+                updateSysUser.setAvatar(sysUser.getAvatar());
+                sysUserMapper.updateById(updateSysUser);
             }
 
-            // 更新用户头象
-            com.yonge.cooleshow.biz.dal.entity.SysUser updateSysUser = new com.yonge.cooleshow.biz.dal.entity.SysUser();
-            updateSysUser.setId(user.getId());
-            updateSysUser.setAvatar(sysUser.getAvatar());
-            sysUserMapper.updateById(updateSysUser);
-
             // 更新机构员工头像和昵称，机构信息表中的用户昵称
             tenantStaffService.lambdaUpdate()
                     .eq(TenantStaff::getUserId, user.getId())