员工管理

controllers/new_mobile_api_controllers/new_role_api_controller.go

@@ -172,7 +172,6 @@ func (this *NewRoleApiController) CreateAdminUser() {
 	userTitle := this.GetString("title")
 	user_type, _ := this.GetInt("user_type", 0)
 	user_title, _ := this.GetInt("user_title", 0)
-	sort, _ := this.GetInt64("sort")
 	if len(mobile) == 0 || len(name) == 0 || len(role_ids) <= 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -185,7 +184,7 @@ func (this *NewRoleApiController) CreateAdminUser() {
 		return
 	} else {
 		if adminUser == nil { //新增账号和用户
-			_, password, createErr := service.CreateGeneralAdminUser(adminUserInfo.Org.Id, adminUserInfo.App.Id, mobile, name, userTitle, role_ids, user_type, user_title, sort)
+			_, password, createErr := service.CreateGeneralAdminUser(adminUserInfo.Org.Id, adminUserInfo.App.Id, mobile, name, userTitle, role_ids, user_type, user_title)
 			if createErr != nil {
 				//beego.Error("创建管理员失败:", createErr)
 				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBCreate)

controllers/role_controller.go

@@ -1,7 +1,6 @@
 package controllers
 
 import (
-	"fmt"
 	"github.com/jinzhu/gorm"
 	"strconv"
 	"strings"
@@ -487,9 +486,6 @@ func (this *RoleAPIController) AddAdmin() {
 	userTitle, _ := this.GetInt("title")
 	roleIds := this.GetString("role")
 	user_title_name := this.GetString("user_title_name")
-	sort, _ := this.GetInt64("sort")
-	fmt.Println("sort--------------------------------", sort)
-	fmt.Println("sort", sort)
 	if len(mobile) == 0 || len(name) == 0 || (userType != 2 && userType != 3 && userType != 4) || len(roleIds) <= 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -502,7 +498,7 @@ func (this *RoleAPIController) AddAdmin() {
 		return
 	} else {
 		if adminUser == nil { //新增账号和用户
-			_, password, createErr := service.CreateGeneralAdminUser(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, mobile, name, user_title_name, roleIds, userType, userTitle, sort)
+			_, password, createErr := service.CreateGeneralAdminUser(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, mobile, name, user_title_name, roleIds, userType, userTitle)
 			if createErr != nil {
 				//beego.Error("创建管理员失败:", createErr)
 				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBCreate)

service/role_service.go

@@ -141,7 +141,7 @@ func GetAdminUsersAndLoginInfo(orgID int64, appID int64, page int, count int) ([
 		page = 1
 	}
 	var viewModels []*AdminUserManageViewModel = make([]*AdminUserManageViewModel, 0)
-	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()
+	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  LIMIT ? OFFSET ?;", orgID, appID, orgID, appID, count, (page-1)*count).Rows()
 	defer rows.Close()
 	if err != nil {
 		if err == gorm.ErrRecordNotFound {
@@ -309,7 +309,7 @@ func IsUserSuperAdminWithMobile(mobile string) (bool, error) {
 	return user.IsSuperAdmin, nil
 }
 
-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) {
+func CreateGeneralAdminUser(orgID int64, appID int64, mobile string, name string, userTitle string, roleIds string, user_type int, user_title int) (*models.AdminUser, string, error) {
 	now := time.Now().Unix()
 	tx := writeUserDb.Begin()
 	var adminUser models.AdminUser
@@ -345,7 +345,6 @@ func CreateGeneralAdminUser(orgID int64, appID int64, mobile string, name string
 		CreateTime:    now,
 		ModifyTime:    now,
 		RoleIds:       roleIds,
-		Sort:          sort,
 	}
 	if createApp_RoleErr := tx.Create(&app_role).Error; createApp_RoleErr != nil {
 		tx.Rollback()