From 7ae2630d3dd82f4dab3a05c9806de657cdb0ee19 Mon Sep 17 00:00:00 2001
From: zhangwenjian <zwj777@live.com>
Date: Wed, 8 Apr 2020 14:24:54 +0800
Subject: [PATCH] update

---
 models/dept.go    | 10 +++++-----
 models/sysuser.go |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/models/dept.go b/models/dept.go
index 50206e7f..e1c95aee 100644
--- a/models/dept.go
+++ b/models/dept.go
@@ -61,14 +61,14 @@ func (e *Dept) Create() (Dept, error) {
 	deptPath := "/" + utils.Int64ToString(e.Deptid)
 	if int(e.ParentId) != 0 {
 		var deptP Dept
-		orm.Eloquent.Table("sys_dept").Where("deptId = ?", e.ParentId).First(&deptP)
+		orm.Eloquent.Table("sys_dept").Where("dept_id = ?", e.ParentId).First(&deptP)
 		deptPath = deptP.DeptPath + deptPath
 	} else {
 		deptPath = "/0" + deptPath
 	}
 	var mp = map[string]string{}
 	mp["deptPath"] = deptPath
-	if err := orm.Eloquent.Table("sys_dept").Where("deptId = ?", e.Deptid).Update(mp).Error; err != nil {
+	if err := orm.Eloquent.Table("sys_dept").Where("dept_id = ?", e.Deptid).Update(mp).Error; err != nil {
 		err := result.Error
 		return doc, err
 	}
@@ -82,7 +82,7 @@ func (e *Dept) Get() (Dept, error) {
 
 	table := orm.Eloquent.Table("sys_dept")
 	if e.Deptid != 0 {
-		table = table.Where("deptId = ?", e.Deptid)
+		table = table.Where("dept_id = ?", e.Deptid)
 	}
 	if e.Deptname != "" {
 		table = table.Where("dept_name = ?", e.Deptname)
@@ -99,7 +99,7 @@ func (e *Dept) GetList() ([]Dept, error) {
 
 	table := orm.Eloquent.Table("sys_dept")
 	if e.Deptid != 0 {
-		table = table.Where("deptId = ?", e.Deptid)
+		table = table.Where("dept_id = ?", e.Deptid)
 	}
 	if e.Deptname != "" {
 		table = table.Where("dept_name = ?", e.Deptname)
@@ -119,7 +119,7 @@ func (e *Dept) GetPage(bl bool) ([]Dept, error) {
 
 	table := orm.Eloquent.Select("*").Table("sys_dept")
 	if e.Deptid != 0 {
-		table = table.Where("deptId = ?", e.Deptid)
+		table = table.Where("dept_id = ?", e.Deptid)
 	}
 	if e.Deptname != "" {
 		table = table.Where("dept_name = ?", e.Deptname)
diff --git a/models/sysuser.go b/models/sysuser.go
index a328eb56..c1cd274d 100644
--- a/models/sysuser.go
+++ b/models/sysuser.go
@@ -149,7 +149,7 @@ func (e *SysUser) GetPage(pageSize int, pageIndex int) ([]SysUserPage, int32, er
 	}
 
 	if e.DeptId != 0 {
-		table = table.Where("dept_id in (select deptId from sys_dept where dept_path like ? )", "%"+utils.Int64ToString(e.DeptId)+"%")
+		table = table.Where("dept_id in (select dept_id from sys_dept where dept_path like ? )", "%"+utils.Int64ToString(e.DeptId)+"%")
 	}
 
 	// 数据权限控制