|
|
@@ -130,6 +130,7 @@ type AdminUserManageViewModel struct {
|
|
130
|
130
|
TitleName string `gorm:"-" json:"title_name"`
|
|
131
|
131
|
IsSubSuperAdmin bool `gorm:"-" json:"is_sub_super_admin"`
|
|
132
|
132
|
//mobile string `gorm:"-" json:"mobile"`
|
|
|
133
|
+ Sort int `gorm:"sort" json:"sort"`
|
|
133
|
134
|
}
|
|
134
|
135
|
|
|
135
|
136
|
func GetAdminUsersAndLoginInfo(orgID int64, appID int64, page int, count int) ([]*AdminUserManageViewModel, int, error) {
|
|
|
@@ -140,7 +141,7 @@ func GetAdminUsersAndLoginInfo(orgID int64, appID int64, page int, count int) ([
|
|
140
|
141
|
page = 1
|
|
141
|
142
|
}
|
|
142
|
143
|
var viewModels []*AdminUserManageViewModel = make([]*AdminUserManageViewModel, 0)
|
|
143
|
|
- rows, err := readUserDb.Raw("SELECT u_a_r.admin_user_id, u_a_r.user_name, u_a_r.user_title, u_l.ip, u_l.ctime, u_a_r.status,u_a_r.avatar,u_a_r.role_ids FROM sgj_user_admin_role AS u_a_r LEFT JOIN (SELECT * FROM (SELECT admin_user_id, org_id, app_id, ip, ctime FROM sgj_user_admin_login_log WHERE org_id = ? AND app_id = ? ORDER BY ctime DESC) AS t GROUP BY admin_user_id) AS u_l ON u_a_r.org_id = u_l.org_id AND u_a_r.app_id = u_l.app_id AND u_a_r.admin_user_id = u_l.admin_user_id WHERE u_a_r.org_id = ? AND u_a_r.app_id = ? GROUP BY u_a_r.admin_user_id LIMIT ? OFFSET ?;", orgID, appID, orgID, appID, count, (page-1)*count).Rows()
|
|
|
144
|
+ rows, err := readUserDb.Raw("SELECT u_a_r.admin_user_id, u_a_r.user_name, u_a_r.user_title, u_l.ip, u_l.ctime, u_a_r.status,u_a_r.avatar,u_a_r.role_ids,u_a_r.sort FROM sgj_user_admin_role AS u_a_r LEFT JOIN (SELECT * FROM (SELECT admin_user_id, org_id, app_id, ip, ctime FROM sgj_user_admin_login_log WHERE org_id = ? AND app_id = ? ORDER BY ctime DESC) AS t GROUP BY admin_user_id) AS u_l ON u_a_r.org_id = u_l.org_id AND u_a_r.app_id = u_l.app_id AND u_a_r.admin_user_id = u_l.admin_user_id WHERE u_a_r.org_id = ? AND u_a_r.app_id = ? GROUP BY u_a_r.admin_user_id order by u_a_r.sort LIMIT ? OFFSET ?;", orgID, appID, orgID, appID, count, (page-1)*count).Rows()
|
|
144
|
145
|
defer rows.Close()
|
|
145
|
146
|
if err != nil {
|
|
146
|
147
|
if err == gorm.ErrRecordNotFound {
|
|
|
@@ -308,7 +309,7 @@ func IsUserSuperAdminWithMobile(mobile string) (bool, error) {
|
|
308
|
309
|
return user.IsSuperAdmin, nil
|
|
309
|
310
|
}
|
|
310
|
311
|
|
|
311
|
|
-func CreateGeneralAdminUser(orgID int64, appID int64, mobile string, name string, userTitle string, roleIds string, user_type int, user_title int) (*models.AdminUser, string, error) {
|
|
|
312
|
+func CreateGeneralAdminUser(orgID int64, appID int64, mobile string, name string, userTitle string, roleIds string, user_type int, user_title int, sort int64) (*models.AdminUser, string, error) {
|
|
312
|
313
|
now := time.Now().Unix()
|
|
313
|
314
|
tx := writeUserDb.Begin()
|
|
314
|
315
|
var adminUser models.AdminUser
|
|
|
@@ -344,6 +345,7 @@ func CreateGeneralAdminUser(orgID int64, appID int64, mobile string, name string
|
|
344
|
345
|
CreateTime: now,
|
|
345
|
346
|
ModifyTime: now,
|
|
346
|
347
|
RoleIds: roleIds,
|
|
|
348
|
+ Sort: sort,
|
|
347
|
349
|
}
|
|
348
|
350
|
if createApp_RoleErr := tx.Create(&app_role).Error; createApp_RoleErr != nil {
|
|
349
|
351
|
tx.Rollback()
|
XMLWAN