sunsheng 1 rok pred
rodič
commit
7e375c9c3c
2 zmenil súbory, kde vykonal 12 pridanie a 4 odobranie
  1. 7 1
      src/api/exeam.go
  2. 5 3
      src/api/exeamLog.go

+ 7 - 1
src/api/exeam.go

@@ -50,5 +50,11 @@ func GenerateExeam(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 	}
 	defer cursor.Close(ctx)
 
-	return result, nil
+	if len(result) == 0 {
+		return map[string]interface{}{
+			"choiceQuestions": []bson.M{},
+			"judgeQuestions":  []bson.M{},
+		}, nil
+	}
+	return result[0], nil
 }

+ 5 - 3
src/api/exeamLog.go

@@ -9,20 +9,22 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/bson/primitive"
 )
 
 // 提交考核试题
 func SubmitExeamLog(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 	db := c.Param("scope")
-	if len(db) == 0 {
-		return nil, errors.New("scope不能为空")
-	}
 	exeamLog := &model.ExeamLog{}
 	err := c.ShouldBindJSON(exeamLog)
 	if err != nil {
 		log.Error(err)
 		return nil, err
 	}
+	cid, _ := primitive.ObjectIDFromHex(exeamLog.Cid)
+	if cid.IsZero() {
+		return nil, errors.New("cid错误")
+	}
 	exeamLog.Uid = apictx.User.ID
 	exeamLog.CreateTime = time.Now()
 	exeamLog.UpdateTime = time.Now()