结构调整添加cmd

models/sysuser.go

@@ -5,10 +5,10 @@ import (
 	orm "go-admin/database"
 	"go-admin/pkg"
 	"go-admin/pkg/utils"
+	"go-admin/tools"
+	"golang.org/x/crypto/bcrypt"
 	"log"
 	"strings"
-
-	"golang.org/x/crypto/bcrypt"
 )
 
 // User
@@ -128,7 +128,6 @@ func (e *SysUser) Get() (SysUserView SysUserView, err error) {
 func (e *SysUser) GetPage(pageSize int, pageIndex int) ([]SysUserPage, int, error) {
 	var doc []SysUserPage
 
-	table := orm.Eloquent.Select("sys_user.*,sys_dept.dept_name").Table(e.TableName())
 	table = table.Joins("left join sys_dept on sys_dept.dept_id = sys_user.dept_id")
 
 	if e.Username != "" {
@@ -136,12 +135,12 @@ func (e *SysUser) GetPage(pageSize int, pageIndex int) ([]SysUserPage, int, erro
 	}
 
 	if e.DeptId != 0 {
-		table = table.Where("sys_user.dept_id in (select dept_id from sys_dept where dept_path like ? )", "%"+utils.IntToString(e.DeptId)+"%")
+		table = table.Where("sys_user.dept_id in (select dept_id from sys_dept where dept_path like ? )", "%"+tools.IntToString(e.DeptId)+"%")
 	}
 
 	// 数据权限控制
 	dataPermission := new(DataPermission)
-	dataPermission.UserId, _ = utils.StringToInt(e.DataScope)
+	dataPermission.UserId, _ = tools.StringToInt(e.DataScope)
 	table = dataPermission.GetDataScope("sys_user", table)
 
 	var count int
@@ -221,16 +220,16 @@ func (e *SysUser) BatchDelete(id []int) (Result bool, err error) {
 
 func (e *SysUser) SetPwd(pwd SysUserPwd) (Result bool, err error) {
 	user, _ := e.Get()
-	_, err = pkg.CompareHashAndPassword(user.Password, pwd.OldPassword)
+	_, err = tools.CompareHashAndPassword(user.Password, pwd.OldPassword)
 	if err != nil {
 		if strings.Contains(err.Error(), "hashedPassword is not the hash of the given password") {
-			pkg.HasError(err, "密码错误(代码202)", 500)
+			tools.HasError(err, "密码错误(代码202)", 500)
 		}
 		log.Print(err)
 		return
 	}
 	e.Password = pwd.NewPassword
 	_, err = e.Update(e.UserId)
-	pkg.HasError(err, "更新密码失败(代码202)", 500)
+	tools.HasError(err, "更新密码失败(代码202)", 500)
 	return
 }