This commit is contained in:
邹宗楠
2022-12-27 14:02:33 +08:00
parent 376a5b89c2
commit ede900560d
2 changed files with 4 additions and 6 deletions

View File

@@ -4,7 +4,6 @@ import (
"errors"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/globals"
)
// SelectUserDefaultTemp 查询用户默认模板
@@ -26,7 +25,6 @@ func QuerySystemTemp() (*model.SystemTemp, error) {
if len(result) > 0 {
return result[0], nil
}
globals.SugarLogger.Debugf("========模板获取异常")
return nil, errors.New("模板获取异常")
}

View File

@@ -82,10 +82,10 @@ func MakePrintMsgOnTemp(param map[string]string, userId string) (string, error)
// 查询用户默认模板,不存在则使用系统默认模板
userTemp := &model.SystemTemp{}
userTemp, isHave, err := SelectUserDefaultTemp(userId, model.TempTypeMerchantUser)
if err != nil || !isHave {
userTemp, err = QuerySystemTemp()
}
if userTemp == nil || !isHave {
//if err != nil || !isHave {
// userTemp, err = QuerySystemTemp()
//}
if userTemp == nil || !isHave || err != nil {
if userTemp.TempType != "" {
userTemp = SystemTempObj[userTemp.TempSize]
} else {