From e5e5b080f500871d8baa5af78915d9a9d32a1d8b Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 03 一月 2024 16:59:00 +0800
Subject: [PATCH] 修复没创建时间和更改时间时空指针问题

---
 model/purchase/request/purchase_type.go |    2 +-
 global/model.go                         |   12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/global/model.go b/global/model.go
index 9a3d5b1..7bc5230 100644
--- a/global/model.go
+++ b/global/model.go
@@ -17,8 +17,16 @@
 }
 
 func (m *GVA_MODEL) AfterFind(tx *gorm.DB) (err error) {
-	m.FormattedCreatedAt = m.CreatedAt.Format("2006-01-02 15:04:05")
-	m.FormattedUpdatedAt = m.UpdatedAt.Format("2006-01-02 15:04:05")
+	if m.CreatedAt != nil {
+		m.FormattedCreatedAt = m.CreatedAt.Format("2006-01-02 15:04:05")
+	} else {
+		m.FormattedCreatedAt = "--"
+	}
+	if m.UpdatedAt != nil {
+		m.FormattedUpdatedAt = m.UpdatedAt.Format("2006-01-02 15:04:05")
+		m.FormattedUpdatedAt = "--"
+	}
+
 	return
 }
 
diff --git a/model/purchase/request/purchase_type.go b/model/purchase/request/purchase_type.go
index 26956c6..5b2a05f 100644
--- a/model/purchase/request/purchase_type.go
+++ b/model/purchase/request/purchase_type.go
@@ -5,7 +5,7 @@
 }
 
 type PurchaseType struct {
-	ID   uint   `gorm:"primarykey"`                                                                 // 涓婚敭ID
+	ID   uint   `gorm:"primarykey" json:"id,string"`                                                // 涓婚敭ID
 	Name string `json:"name" form:"name" gorm:"type:varchar(255);not null;default '';comment:閲囪喘绫诲瀷"` // 閲囪喘绫诲瀷
 	Sort int    `json:"sort" form:"sort" gorm:"type:int(11);not null;default 0;comment:鎺掑簭"`         // 鎺掑簭
 	Pin  bool   `json:"pin" form:"pin" gorm:"type:tinyint(1);not null;default 0;comment:閲囪喘鍚嶇О"`      // 鏄惁缃《

--
Gitblit v1.8.0