From 20ec2581c7b46156f362f4b1b66b08ba6f7cfeab Mon Sep 17 00:00:00 2001
From: DengBiao <2319963317@qq.com>
Date: Fri, 22 Sep 2023 11:16:04 +0800
Subject: [PATCH] update

---
 .../hdl_self_support_for_school.go                  | 13 +++++++------
 app/admin/md/md_enterprise_manage.go                |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/admin/hdl/enterprise_manage/hdl_self_support_for_school.go b/app/admin/hdl/enterprise_manage/hdl_self_support_for_school.go
index 25416ee..1853d47 100644
--- a/app/admin/hdl/enterprise_manage/hdl_self_support_for_school.go
+++ b/app/admin/hdl/enterprise_manage/hdl_self_support_for_school.go
@@ -919,8 +919,9 @@ func SelfSupportForSchoolImportTeacher(c *gin.Context) {
 			if info == nil {
 				selfSupportForSchoolInfoDb := db.SelfSupportForSchoolInfoDb{}
 				selfSupportForSchoolInfoDb.Set(enterpriseId)
-				selfSupportForSchoolInfo, err := selfSupportForSchoolInfoDb.GetSelfSupportForSchoolInfo()
-				if err != nil {
+				selfSupportForSchoolInfo, err1 := selfSupportForSchoolInfoDb.GetSelfSupportForSchoolInfo()
+				if err1 != nil {
+					e.OutErr(c, e.ERR_DB_ORM, err.Error())
 					return
 				}
 				if selfSupportForSchoolInfo == nil {
@@ -942,16 +943,16 @@ func SelfSupportForSchoolImportTeacher(c *gin.Context) {
 					CreateAt:                        now.Format("2006-01-02 15:04:05"),
 					UpdateAt:                        now.Format("2006-01-02 15:04:05"),
 				}
-				_, err1 := selfSupportForUserFaceInfoDb.SelfSupportForUserFaceInfoInsert(info)
+				_, err1 = selfSupportForUserFaceInfoDb.SelfSupportForUserFaceInfoInsert(info)
 				if err1 != nil {
 					e.OutErr(c, e.ERR, err1.Error())
 					return
 				}
 			} else {
 				info.CollectFaceType = 1
-				_, err = selfSupportForUserFaceInfoDb.SelfSupportForUserFaceInfoUpdate(info, "collect_face_type")
-				if err != nil {
-					e.OutErr(c, e.ERR_DB_ORM, err.Error())
+				_, err1 := selfSupportForUserFaceInfoDb.SelfSupportForUserFaceInfoUpdate(info, "collect_face_type")
+				if err1 != nil {
+					e.OutErr(c, e.ERR_DB_ORM, err1.Error())
 					return
 				}
 			}
diff --git a/app/admin/md/md_enterprise_manage.go b/app/admin/md/md_enterprise_manage.go
index b3c6449..b8db24b 100644
--- a/app/admin/md/md_enterprise_manage.go
+++ b/app/admin/md/md_enterprise_manage.go
@@ -42,7 +42,7 @@ type EnterpriseUserListByCentralKitchenForSchoolResp struct {
 type CentralKitchenForSchoolUserUpdateReq struct {
 	EnterpriseId       int    `json:"enterprise_id" binding:"required" label:"企业id"`
 	Uid                int    `json:"uid" binding:"required" label:"用户id"`
-	Nickname           string `json:"nickname" binding:"required" label:"支付宝昵称"`
+	Nickname           string `json:"nickname" label:"支付宝昵称"`
 	Phone              string `json:"phone" binding:"required" label:"手机号"`
 	BindUserIdentities []struct {
 		UserIdentityId int    `json:"user_identity_id" label:"用户身份id"`