Merge branch 'feature/0721-tenant' of http://git.dayaedu.com/yonge/cooleshow

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

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

@@ -358,7 +358,9 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 		pageInfo.setRows(dataList);
 		Map<String, Object> result = new HashMap<>();
 		userTrainOverView.setTrainTime(userTrainOverView.getTrainTime()/60);
-		userTrainOverView.setAvgTrainTime(userTrainOverView.getTrainTime() / Math.max(userTrainOverView.getTrainDays(), 1));
+		if(userTrainOverView.getTrainTime() > 0 && userTrainOverView.getTrainDays() > 0){
+			userTrainOverView.setAvgTrainTime(userTrainOverView.getTrainTime() / userTrainOverView.getTrainDays());
+		}
 		result.put("userTrainOverView",userTrainOverView);
 
 		List<IndexBaseDto> userTrainChartResult = new ArrayList<>();