From d8252fe9e95b26ea122673f3c2f61930b37c6d50 Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Fri, 25 Nov 2022 23:10:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E8=AF=84=E5=88=86=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xboe/module/interaction/api/CourseGradeApi.java    |  7 +++++--
 .../interaction/service/ICourseGradeService.java       |  2 +-
 .../service/impl/CourseGradeServiceImpl.java           | 10 +++++-----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CourseGradeApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CourseGradeApi.java
index ea2eefc2..2b8dd7d0 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CourseGradeApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CourseGradeApi.java
@@ -57,14 +57,17 @@ public class CourseGradeApi extends ApiBaseController {
      * 查询当前用户评分的课程 分数
      * */
     @PostMapping("/score")
-    public JsonResponse<Map<String,Object>> score(String courseId,String aid){
+    public JsonResponse<CourseGrade> score(String courseId,String aid){
         if(StringUtils.isBlank(courseId)){
             return badRequest("参数异常");
         }
         if(StringUtils.isBlank(aid)){
             aid=this.getCurrent().getAccountId();
         }
-        Map<String, Object> score = service.score(courseId, aid);
+        CourseGrade score = service.score(courseId, aid);
+        if(score==null) {
+        	return notfound();
+        }
         return success(score);
     }
 
diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/ICourseGradeService.java b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/ICourseGradeService.java
index f42a37aa..329dbd49 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/ICourseGradeService.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/ICourseGradeService.java
@@ -26,5 +26,5 @@ public interface ICourseGradeService {
     /**
      * 查询当前用户评分的课程
      * */
-    Map<String,Object> score(String courseId,String aid);
+    CourseGrade score(String courseId,String aid);
 }
diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/impl/CourseGradeServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/impl/CourseGradeServiceImpl.java
index ac9dcf07..6efd7bae 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/impl/CourseGradeServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/impl/CourseGradeServiceImpl.java
@@ -81,11 +81,11 @@ public class CourseGradeServiceImpl implements ICourseGradeService {
     }
 
     @Override
-    public Map<String, Object> score(String courseId, String aid) {
-        HashMap<String, Object> map = new HashMap<>();
-        Object field = courseGradeDao.findField("scores", FieldFilters.eq("courseId", courseId), FieldFilters.eq("sysCreateAid", aid));
-        map.put(courseId,field);
-        return map;
+    public CourseGrade score(String courseId, String aid) {
+      
+        CourseGrade cg = courseGradeDao.findOne(FieldFilters.eq("courseId", courseId), FieldFilters.eq("sysCreateAid", aid));
+        
+        return cg;
     }