From 6b0b1bb836431ccd86162a36220a4e6531da1f0b Mon Sep 17 00:00:00 2001
From: wenjianzhang <zwj777@live.com>
Date: Sun, 29 Nov 2020 00:19:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8D=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=81=9C=E7=94=A8=E7=8A=B6=E6=80=81=E8=BF=98=E8=83=BD?=
 =?UTF-8?q?=E7=99=BB=E9=99=86=E9=97=AE=E9=A2=98=EF=BC=88#287=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/models/login.go                     |  2 +-
 .../version/1606579402398_migrate.go          | 37 +++++++++++++++++++
 common/global/adm.go                          |  2 +-
 3 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 cmd/migrate/migration/version/1606579402398_migrate.go

diff --git a/app/admin/models/login.go b/app/admin/models/login.go
index 26a4c4b8..a045976a 100644
--- a/app/admin/models/login.go
+++ b/app/admin/models/login.go
@@ -14,7 +14,7 @@ type Login struct {
 
 func (u *Login) GetUser() (user SysUser, role SysRole, e error) {
 
-	e = orm.Eloquent.Table("sys_user").Where("username = ? ", u.Username).Find(&user).Error
+	e = orm.Eloquent.Table("sys_user").Where("username = ?  and status = 2", u.Username).Find(&user).Error
 	if e != nil {
 		return
 	}
diff --git a/cmd/migrate/migration/version/1606579402398_migrate.go b/cmd/migrate/migration/version/1606579402398_migrate.go
new file mode 100644
index 00000000..bd650da1
--- /dev/null
+++ b/cmd/migrate/migration/version/1606579402398_migrate.go
@@ -0,0 +1,37 @@
+package version
+
+import (
+	"go-admin/app/admin/models"
+	//"go-admin/app/admin/models"
+	"gorm.io/gorm"
+	"runtime"
+
+	"go-admin/cmd/migrate/migration"
+	common "go-admin/common/models"
+)
+
+func init() {
+	_, fileName, _, _ := runtime.Caller(0)
+	migration.Migrate.SetVersion(migration.GetFilename(fileName), _1606579402398Test)
+}
+
+func _1606579402398Test(db *gorm.DB, version string) error {
+	return db.Transaction(func(tx *gorm.DB) error {
+
+		dicData := models.DictData{}
+		err := tx.Model(&dicData).Where("dict_code = ?", 1).Update("dict_value", 2).Error
+		if err != nil {
+			return err
+		}
+
+		user := models.SysUser{}
+		err = tx.Model(&user).Where("user_id = ?", 1).Update("status", 2).Error
+		if err != nil {
+			return err
+		}
+
+		return tx.Create(&common.Migration{
+			Version: version,
+		}).Error
+	})
+}
diff --git a/common/global/adm.go b/common/global/adm.go
index fad74f48..291e4fef 100644
--- a/common/global/adm.go
+++ b/common/global/adm.go
@@ -12,7 +12,7 @@ import (
 
 const (
 	// go-admin Version Info
-	Version = "1.2.2"
+	Version = "1.2.3"
 )
 
 var Cfg config.Conf = config.DefaultConfig()