feat：完善项目

app/model/sys_user.go

@@ -1,30 +1,39 @@
 package model
 
 import (
-	model2 "ArmedPolice/app/common/model"
+	"ArmedPolice/app/common/model"
 	"ArmedPolice/serve/orm"
 	"ArmedPolice/utils"
 	"errors"
+	"fmt"
 
 	"gorm.io/gorm"
 )
 
 // SysUser 用户信息
 type SysUser struct {
-	*model2.SysUser
+	*model.SysUser
 }
 
+type (
+	// SysUserInfo 用户信息
+	SysUserInfo struct {
+		*model.SysUser
+		TenantName string `json:"tenant_name"`
+	}
+)
+
 func (m *SysUser) ValidatePassword(password string) bool {
 	return utils.HashCompare([]byte(m.Password), []byte(utils.Md5String(password, m.Salt)))
 }
 
 func (m *SysUser) IsAdminUser() bool {
-	return m.IsAdmin == model2.SysUserAdministratorForAdmin
+	return m.IsAdmin == model.SysUserAdministratorForAdmin
 }
 
 func (m *SysUser) GetByAccountOrMobile(param string) (bool, error) {
 	db := orm.GetDB().Table(m.TableName()).Where("(account = ? OR mobile = ?)", param, param).
-		Where("is_deleted = ?", model2.DeleteStatusForNot)
+		Where("is_deleted = ?", model.DeleteStatusForNot)
 
 	if err := db.First(m.SysUser).Error; err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
@@ -35,6 +44,29 @@ func (m *SysUser) GetByAccountOrMobile(param string) (bool, error) {
 	return true, nil
 }
 
-func NewSysUser() *SysUser {
-	return &SysUser{SysUser: model2.NewSysUser()}
+func (m *SysUser) Users(page, pageSize int, count *int64, where ...*model.ModelWhere) ([]*SysUserInfo, error) {
+	mSysTenant := model.NewSysTenant()
+
+	db := orm.GetDB().Table(m.TableName()+" As u").Select("u.*", "t.name AS tenant_name").
+		Joins(fmt.Sprintf("LEFT JOIN %s AS t ON u.tenant_id = t.id", mSysTenant.TableName())).
+		Where("u.is_deleted = ?", model.DeleteStatusForNot)
+
+	out := make([]*SysUserInfo, 0)
+
+	if len(where) > 0 {
+		for _, wo := range where {
+			db = db.Where(wo.Condition, wo.Value)
+		}
+	}
+	if err := db.Order("u.id " + model.OrderModeToAsc).Offset((page - 1) * pageSize).Limit(pageSize).Scan(&out).Error; err != nil {
+		return nil, err
+	}
+	if err := db.Count(count).Error; err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func NewSysUser() *SysUser {
+	return &SysUser{SysUser: model.NewSysUser()}
 }