yonge 3 년 전
부모
커밋
b12b1f437c

+ 1 - 1
cooleshow-user/user-biz/src/main/resources/config/mybatis/ActivityEvaluationRecordMapper.xml

@@ -50,7 +50,7 @@
         left join subject s on s.id_ = stu.subject_id_
 		where aer.activity_id_ = #{activityPlanId} and aer.evaluation_id_ = #{activityEvaluationId} and aer.score_ > 0
 		order by aer.score_ desc,aer.times_ asc, aer.id_ asc 
-		) a group by userId order by score desc,id_ asc
+		) a group by userId order by score desc,times asc,id_ asc
 		limit #{limit}
     </select>
 

+ 1 - 1
cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/open/ActivityEvaluationRecordController.java

@@ -38,7 +38,7 @@ public class ActivityEvaluationRecordController extends BaseController {
         ModelMap model = new ModelMap();
         
         SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null || null == user.getId()) {
+        if (user != null && null != user.getId()) {
             ActivityRankingVo userActivityRankingVo = activityEvaluationRecordService.queryUserRanking(activityPlanId, activityEvaluationId, user.getId());
             model.put("userActivityRankingVo", userActivityRankingVo);
         }