Merge remote-tracking branch 'origin/dm' into dm

models/ai_summary/ai_summary_classify.go

@@ -1,6 +1,7 @@
 package ai_summary
 
 import (
+	sql2 "database/sql"
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
 	"fmt"
@@ -393,7 +394,11 @@ FROM
 WHERE
 	ai_summary_classify_id = vm._id `
 	}
-	err = o.Raw(sql, aiSummaryClassifyId).Scan(&ids).Error
+	var sqlIds sql2.NullString
+	err = o.Raw(sql, aiSummaryClassifyId).Scan(&sqlIds).Error
+	if sqlIds.Valid {
+		ids = sqlIds.String
+	}
 	return
 }
 

models/aimod/ai.go

@@ -3,6 +3,7 @@ package aimod
 import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
+	"gorm.io/gorm"
 	"time"
 )
 
@@ -84,6 +85,11 @@ type AiChatTopicView struct {
 	ThreadId      string
 }
 
+func (obj *AiChatTopicView) AfterFind(tx *gorm.DB) (err error) {
+			obj.CreateTime = utils.GormDateStrToDateTimeStr(obj.CreateTime)
+			obj.ModifyTime = utils.GormDateStrToDateTimeStr(obj.ModifyTime)
+			return
+}
 func GetAiChatTopicList(sysUserId int) (item []*AiChatTopicView, err error) {
 	sql := ` SELECT * FROM ai_chat_topic WHERE sys_user_id=? ORDER BY create_time DESC `
 	o := global.DbMap[utils.DbNameAI]