liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
business/dao/dao_print_temp.go
View File

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

8
business/dao/print_temp_utils.go
View File

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