From 2ed73cae18aed945c4de74e01caf9425b53590bf Mon Sep 17 00:00:00 2001
From: SliverHorn <503551462@qq.com>
Date: Wed, 23 Sep 2020 11:14:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9gorm=E7=94=9F=E6=88=90=E7=9A=84?=
 =?UTF-8?q?=E5=A4=96=E9=94=AE=E8=A1=A8=E5=A4=9As=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BD=9C=E5=87=BA=E5=85=BC=E5=AE=B9=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/gva/init_data/init_data.go | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/server/gva/init_data/init_data.go b/server/gva/init_data/init_data.go
index 41e4441b..32082f6a 100644
--- a/server/gva/init_data/init_data.go
+++ b/server/gva/init_data/init_data.go
@@ -411,7 +411,13 @@ func InitSysDataAuthorityId() (err error) {
 		{"9528", "8881"},
 		{"9528", "9528"},
 	}
-	if tx.Table("sys_data_authority_ids").Create(&insert).Error != nil { // 遇到错误时回滚事务
+	if global.GVA_DB.Migrator().HasTable("sys_data_authority_ids") {
+		if tx.Table("sys_data_authority_ids").Create(&insert).Error != nil { // 遇到错误时回滚事务
+			tx.Rollback()
+		}
+		return tx.Commit().Error
+	}
+	if tx.Table("sys_data_authority_id").Create(&insert).Error != nil { // 遇到错误时回滚事务
 		tx.Rollback()
 	}
 	return tx.Commit().Error