Merge branch 'local/1030_music' into online

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

@@ -278,8 +278,8 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 		jsonObject.put("intonation", userLastEvaluationData.getIntonation());
 		jsonObject.put("integrity", userLastEvaluationData.getIntegrity());
 		jsonObject.put("heardLevel", userLastEvaluationData.getHeardLevel());
-		jsonObject.put("videoFilePath", userLastEvaluationData.getVideoFilePath());
-		jsonObject.put("partIndex", userLastEvaluationData.getPartIndex());
+        jsonObject.put("videoFilePath", StringUtils.isNotBlank(userLastEvaluationData.getVideoFilePath())?userLastEvaluationData.getVideoFilePath():userLastEvaluationData.getRecordFilePath());
+        jsonObject.put("partIndex", userLastEvaluationData.getPartIndex());
 		jsonObject.put("customConfiguration", userLastEvaluationData.getCustomConfiguration());
 		if(userLastEvaluationData.getCreateTime() == null) {
 			jsonObject.put("expire", 1);