From 331dd512551529a0b69aa35ab026a60eadb79bde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Fri, 16 Dec 2022 11:09:56 +0800
Subject: [PATCH] 1

---
 business/dao/dao_print_temp.go   | 13 ++++++++++---
 business/dao/print_temp_utils.go |  5 ++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/business/dao/dao_print_temp.go b/business/dao/dao_print_temp.go
index 6e1d3c0e5..18364d872 100644
--- a/business/dao/dao_print_temp.go
+++ b/business/dao/dao_print_temp.go
@@ -1,8 +1,10 @@
 package dao
 
 import (
+	"errors"
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/model"
+	"git.rosy.net.cn/jx-callback/globals"
 )
 
 // SelectUserDefaultTemp 查询用户默认模板
@@ -15,12 +17,17 @@ func SelectUserDefaultTemp(userId string, tempType string) (*model.SystemTemp, b
 }
 
 // QuerySystemTemp 查询系统模板
-func QuerySystemTemp() ([]*model.SystemTemp, error) {
+func QuerySystemTemp() (*model.SystemTemp, error) {
 	var result []*model.SystemTemp
-	if err := GetRows(GetDB(), &result, `SELECT * FROM system_temp WHERE user_id = ? ORDER BY created_at desc `, []interface{}{"system_user"}...); err != nil {
+	if err := GetRows(GetDB(), &result, `SELECT * FROM system_temp WHERE user_id = ? AND temp_type = ? AND is_use = ? AND deleted_at = ? ORDER BY created_at desc  `, []interface{}{"system_user", "user_store", 1, utils.DefaultTimeValue}...); err != nil {
 		return nil, err
 	}
-	return result, nil
+
+	if len(result) > 0 {
+		return result[0], nil
+	}
+	globals.SugarLogger.Debugf("========模板获取异常")
+	return nil, errors.New("模板获取异常")
 }
 
 // AddTemp 添加模板数据
diff --git a/business/dao/print_temp_utils.go b/business/dao/print_temp_utils.go
index adf7512bf..0763230b8 100644
--- a/business/dao/print_temp_utils.go
+++ b/business/dao/print_temp_utils.go
@@ -91,9 +91,8 @@ func MakePrintMsgOnTemp(param map[string]string, userId string) (string, error)
 	// 查询用户默认模板,不存在则使用系统默认模板
 	userTemp := &model.SystemTemp{}
 	userTemp, isHave, err := SelectUserDefaultTemp(userId, model.TempTypeMerchantUser)
-	globals.SugarLogger.Debugf("===userTemp======== %s", utils.Format4Output(userTemp, false))
-	if err != nil {
-		return "", err
+	if err != nil || !isHave {
+		userTemp, err = QuerySystemTemp()
 	}
 	if userTemp == nil || !isHave {
 		if userTemp.TempType != "" {