消毒计划

controllers/role_controller.go

@@ -1,6 +1,7 @@
 package controllers
 
 import (
+	"fmt"
 	"github.com/jinzhu/gorm"
 	"strconv"
 	"strings"
@@ -486,7 +487,9 @@ 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
@@ -499,7 +502,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)
+			_, password, createErr := service.CreateGeneralAdminUser(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, mobile, name, user_title_name, roleIds, userType, userTitle, sort)
 			if createErr != nil {
 				//beego.Error("创建管理员失败:", createErr)
 				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBCreate)
@@ -632,7 +635,7 @@ func (this *RoleAPIController) EditAdmin() {
 	roleIds := this.GetString("role")
 	intro := this.GetString("intro")
 	user_title_name := this.GetString("user_title_name")
-
+	sort, _ := this.GetInt64("sort")
 	_, titleExist := models.UserTitle[userTitle]
 	if adminUserId <= 0 || len(name) == 0 || (userType != 2 && userType != 3 && userType != 4) || !titleExist || len(roleIds) <= 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -657,6 +660,7 @@ func (this *RoleAPIController) EditAdmin() {
 	appRole.Intro = intro
 	appRole.UserTitleName = user_title_name
 	appRole.ModifyTime = time.Now().Unix()
+	appRole.Sort = sort
 	saveErr := service.SaveAppRole(appRole)
 	if saveErr != nil {
 		//beego.Error("修改App_Role失败:", saveErr)