feat：优化项目信息

app/api/admin/model/sys_user.go

@@ -36,8 +36,8 @@ func (m *SysUser) IsAdminUser() bool {
 
 func (m *SysUser) GetByAccountOrMobile(account string, tenantID uint64) (bool, error) {
 	db := orm.GetDB().Table(m.TableName()).
-		Select("id", "uuid", "tenant_id", "name", "mobile", "password", "salt", "is_admin", "status").
-		Where("tenant_id = ?", tenantID).
+		Select("id", "uuid", "name", "mobile", "password", "salt", "is_admin", "status").
+		//Where("tenant_id = ?", tenantID).
 		//Where("(email = ? OR mobile = ?)", account, account).
 		Where("mobile = ?", account).
 		Where("is_deleted = ?", model.DeleteStatusForNot)

app/api/admin/model/sys_user_tenant.go

@@ -0,0 +1,85 @@
+package model
+
+import (
+	"SciencesServer/app/common/model"
+	"SciencesServer/serve/orm"
+	"fmt"
+)
+
+type SysUserTenant struct {
+	*model.SysUserTenant
+}
+
+type (
+	// SysUserTenantBasic 基本信息
+	SysUserTenantBasic struct {
+		model.Model
+		Account string `json:"account"`
+		Name    string `json:"name"`
+		Mobile  string `json:"mobile"`
+	}
+	// SysUserTenantInfo 详细信息
+	SysUserTenantInfo struct {
+		*model.SysUser
+		model.Model
+		DepartmentID   uint64 `json:"-"`
+		DepartmentName string `json:"-"`
+		RoleIDs        string `json:"-"`
+		RoleNames      string `json:"-"`
+	}
+)
+
+// User 用户信息
+func (m *SysUserTenant) User(where ...*model.ModelWhere) (*SysUserTenantBasic, error) {
+	db := orm.GetDB().Table(m.TableName()+" AS u_t").
+		Select("u_t.id", "u.account", "u.name", "u.mobile").
+		Joins(fmt.Sprintf("LEFT JOIN %s AS u ON u_t.uid = u.uuid", model.NewSysUser().TableName())).
+		Where("u_t.is_deleted = ?", model.DeleteStatusForNot)
+
+	if len(where) > 0 {
+		for _, v := range where {
+			db = db.Where(v.Condition, v.Value)
+		}
+	}
+	out := new(SysUserTenantBasic)
+
+	err := db.Scan(out).Error
+
+	return out, err
+}
+
+// Users 用户信息
+func (m *SysUserTenant) Users(page, pageSize int, count *int64, where ...*model.ModelWhere) ([]*SysUserTenantInfo, error) {
+	db := orm.GetDB().Table(m.TableName()+" AS u_t").
+		Select("u_t.id", "u.uuid", "u.account", "u.avatar", "u.name", "u.mobile", "u.gender",
+			"u.is_admin", "u.status", "u.created_at", "d.id AS department_id", "d.name AS department_name",
+			"u_r.role_ids", "u_r.role_names").
+		Joins(fmt.Sprintf("LEFT JOIN %s AS u ON u_t.uid = u.uuid", model.NewSysUser().TableName())).
+		Joins(fmt.Sprintf("LEFT JOIN %s AS u_d ON u_t.id = u_d.user_tenant_id AND u_d.is_deleted = %d",
+			model.NewSysUserDepartment().TableName(), model.DeleteStatusForNot)).
+		Joins(fmt.Sprintf("LEFT JOIN %s AS d ON u_d.department_id = d.id",
+			model.NewSysDepartment().TableName())).
+		Joins(fmt.Sprintf("LEFT JOIN (SELECT user_tenant_id, GROUP_CONCAT(r.id SEPARATOR '&&') AS role_ids, GROUP_CONCAT(r.name SEPARATOR '&&') AS role_names "+
+			"FROM %s AS u LEFT JOIN %s AS r ON u.role_id = r.id WHERE u.is_deleted = %d GROUP BY u.user_tenant_id) u_r ON u_t.id = u_r.user_tenant_id",
+			model.NewSysUserRole().TableName(), model.NewSysRole().TableName(), model.DeleteStatusForNot)).
+		Where("u_t.is_deleted = ?", model.DeleteStatusForNot)
+
+	if len(where) > 0 {
+		for _, wo := range where {
+			db = db.Where(wo.Condition, wo.Value)
+		}
+	}
+	out := make([]*SysUserTenantInfo, 0)
+
+	if err := db.Count(count).Error; err != nil {
+		return nil, err
+	}
+	if err := db.Order("u_t.id " + model.OrderModeToDesc).Offset((page - 1) * pageSize).Limit(pageSize).Scan(&out).Error; err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func NewSysUserTenant() *SysUserTenant {
+	return &SysUserTenant{model.NewSysUserTenant()}
+}