update

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

@@ -2,6 +2,7 @@ package com.ym.mec.biz.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.*;
@@ -24,6 +25,7 @@ import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -54,6 +56,9 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 	private StudentVisitDao studentVisitDao;
 	@Autowired
 	private SysMessageService sysMessageService;
+	
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
 
 	@Autowired
 	private SysConfigDao sysConfigDao;
@@ -185,6 +190,12 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 			}
 		}
 		head.setStudentNum(studentDao.countStudentsWithOrgan(null));
+		if(StringUtils.isBlank(head.getAvatar())){
+			SysUser user = sysUserFeignService.queryUserById(queryInfo.getUserId());
+			if(user != null){
+				head.setAvatar(user.getAvatar());
+			}
+		}
 		result.setHead(head);
 		detail.sort(Comparator.comparing(MusicCompareRankingDto::getRankNum).thenComparing(MusicCompareRankingDto::getUserId));
 		result.setDetail(detail);

mec-student/src/main/java/com/ym/mec/student/controller/StudentManageController.java

@@ -53,6 +53,7 @@ import com.ym.mec.common.entity.UploadReturnBean;
 import com.ym.mec.common.filters.TenantIdThreadLocal;
 import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.util.date.DateUtil;
+import com.ym.mec.util.http.HttpUtil;
 import com.ym.mec.util.upload.UploadUtil;
 
 @Api(tags = "学生管理")
@@ -331,4 +332,10 @@ public class StudentManageController extends BaseController {
         }
         return succeed(organizationService.getGradeList(sysUser.getOrganId()));
     }
+
+    @ApiOperation(value = "url短链接")
+    @PostMapping("shortURL")
+    public HttpResponseResult<String> shortURL(String orginURL) {
+        return succeed(HttpUtil.getSortUrl(orginURL));
+    }
 }