From ede900560d39b152ff760521c254963ffda2cead Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Tue, 27 Dec 2022 14:02:33 +0800
Subject: [PATCH] 1

---
 business/dao/dao_print_temp.go   | 2 --
 business/dao/print_temp_utils.go | 8 ++++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/business/dao/dao_print_temp.go b/business/dao/dao_print_temp.go
index 18364d872..31da35837 100644
--- a/business/dao/dao_print_temp.go
+++ b/business/dao/dao_print_temp.go
@@ -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("模板获取异常")
 }
 
diff --git a/business/dao/print_temp_utils.go b/business/dao/print_temp_utils.go
index 918544782..06178242c 100644
--- a/business/dao/print_temp_utils.go
+++ b/business/dao/print_temp_utils.go
@@ -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 {