Merge branch 'master' of http://git.shengws.com/csx/XT_New

controllers/new_mobile_api_controllers/home_api_controller.go

@@ -6,7 +6,11 @@ import (
 	"XT_New/models"
 	"XT_New/service"
 	"XT_New/utils"
+	"encoding/json"
 	"github.com/astaxie/beego"
+	"io/ioutil"
+	"net/http"
+	"net/url"
 	"strconv"
 	"time"
 )
@@ -278,6 +282,22 @@ func (this *HomeController) CreateOrg() {
 		}
 	}
 
+	var orgs []*models.Org
+	vmAdminUser, err := service.GetHomeData(adminUser.Id)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	for _, item := range vmAdminUser.Org {
+		orgs = append(orgs, item)
+	}
+	for _, item := range vmAdminUser.VMApp_Role {
+		for _, subItem := range item.Org {
+			orgs = append(orgs, subItem)
+		}
+	}
+	orgs = RemoveRepeatedOrgElement(orgs)
+
 	orgType := service.GetOrgTypeByName(org_type)
 
 	org := &models.Org{
@@ -318,9 +338,170 @@ func (this *HomeController) CreateOrg() {
 
 		//初始化显示配置
 
-		this.ServeSuccessJSON(map[string]interface{}{
-			"org": org,
-		})
+		if len(orgs) == 0 {
+			ip := utils.GetIP(this.Ctx.Request)
+			ssoDomain := beego.AppConfig.String("sso_domain")
+			api := ssoDomain + "/m/login/pwd"
+			values := make(url.Values)
+			values.Set("mobile", adminUser.Mobile)
+			values.Set("password", adminUser.Password)
+			values.Set("app_type", "3")
+			values.Set("ip", ip)
+			resp, requestErr := http.PostForm(api, values)
+
+			if requestErr != nil {
+				utils.ErrorLog("请求SSO登录接口失败: %v", requestErr)
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			defer resp.Body.Close()
+			body, ioErr := ioutil.ReadAll(resp.Body)
+			if ioErr != nil {
+				utils.ErrorLog("SSO登录接口返回数据读取失败: %v", ioErr)
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			var respJSON map[string]interface{}
+			utils.InfoLog(string(body))
+			if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+				utils.ErrorLog("SSO登录接口返回数据解析JSON失败: %v", err)
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+			if respJSON["state"].(float64) != 1 {
+				msg := respJSON["msg"].(string)
+				utils.ErrorLog("SSO登录接口请求失败: %v", msg)
+				if int(respJSON["code"].(float64)) == 609 {
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAccountOrPasswordWrong)
+					return
+				}
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			} else {
+				utils.SuccessLog("SSO登录成功")
+				// 下面这几段 Map=>JSON=>Struct 的流程可能会造成速度很慢
+				userJSON := respJSON["data"].(map[string]interface{})["admin"].(map[string]interface{})
+				userJSONBytes, _ := json.Marshal(userJSON)
+				var adminUser models.AdminUser
+				if err := json.Unmarshal(userJSONBytes, &adminUser); err != nil {
+					utils.ErrorLog("解析管理员失败：%v", err)
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+
+				var org models.Org
+				if respJSON["data"].(map[string]interface{})["org"] != nil {
+					orgJSON := respJSON["data"].(map[string]interface{})["org"].(map[string]interface{})
+					orgJSONBytes, _ := json.Marshal(orgJSON)
+					if err := json.Unmarshal(orgJSONBytes, &org); err != nil {
+						utils.ErrorLog("解析机构失败：%v", err)
+						this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+						return
+					}
+				}
+
+				var app models.OrgApp
+
+				if respJSON["data"].(map[string]interface{})["app"] != nil {
+					appJSON := respJSON["data"].(map[string]interface{})["app"].(map[string]interface{})
+					appJSONBytes, _ := json.Marshal(appJSON)
+					if err := json.Unmarshal(appJSONBytes, &app); err != nil {
+						utils.ErrorLog("解析应用失败：%v", err)
+						this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+						return
+					}
+				}
+
+				var appRole models.App_Role
+
+				if respJSON["data"].(map[string]interface{})["app_role"] != nil {
+					appRoleJSON := respJSON["data"].(map[string]interface{})["app_role"].(map[string]interface{})
+					appRoleJSONBytes, _ := json.Marshal(appRoleJSON)
+					if err := json.Unmarshal(appRoleJSONBytes, &appRole); err != nil {
+						utils.ErrorLog("解析AppRole失败：%v", err)
+						this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+						return
+					}
+				}
+
+				var subscibe models.ServeSubscibe
+				if respJSON["data"].(map[string]interface{})["subscibe"] != nil {
+					subscibeJSON := respJSON["data"].(map[string]interface{})["subscibe"].(map[string]interface{})
+					subscibeJSONBytes, _ := json.Marshal(subscibeJSON)
+					if err := json.Unmarshal(subscibeJSONBytes, &subscibe); err != nil {
+						utils.ErrorLog("解析Subscibe失败：%v", err)
+						this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+						return
+					}
+
+				}
+
+				//service.GetOrgSubscibeState(&subscibe)
+				templateInfo, _ := service.GetOrgInfoTemplate(org.Id)
+
+				mobileAdminUserInfo := &mobile_api_controllers.MobileAdminUserInfo{
+					AdminUser:    &adminUser,
+					Org:          &org,
+					App:          &app,
+					AppRole:      &appRole,
+					Subscibe:     &subscibe,
+					TemplateInfo: &templateInfo,
+				}
+				this.Ctx.SetCookie("token_cookie", "")
+
+				//设置seesion
+				this.SetSession("mobile_admin_user_info", mobileAdminUserInfo)
+
+				//设置cookie
+				mobile := adminUser.Mobile + "-" + strconv.FormatInt(org.Id, 10) + "-" + strconv.FormatInt(appRole.Id, 10)
+				token := utils.GenerateLoginToken(mobile)
+				expiration, _ := beego.AppConfig.Int64("mobile_token_expiration_second")
+				this.Ctx.SetCookie("token_cookie", token, expiration, "/")
+
+				var configList interface{}
+				var FiledList []*models.FiledConfig
+
+				if org.Id > 0 {
+					configList, _ = service.GetConfigList(org.Id)
+					FiledList, _ = service.FindFiledByOrgId(org.Id)
+				}
+				if len(FiledList) == 0 {
+					var err error
+					if org.Id > 0 {
+						err = service.BatchInsertFiledConfig(org.Id)
+						if err == nil {
+							FiledList, _ = service.FindFiledByOrgId(org.Id)
+						} else {
+							utils.ErrorLog("字段批量插入失败：%v", err)
+						}
+					} else {
+						FiledList = make([]*models.FiledConfig, 0)
+					}
+				}
+
+				this.ServeSuccessJSON(map[string]interface{}{
+					"admin": adminUser,
+					"user":  appRole,
+					"org":   org,
+					"template_info": map[string]interface{}{
+						"id":          templateInfo.ID,
+						"org_id":      templateInfo.OrgId,
+						"template_id": templateInfo.TemplateId,
+					},
+					"config_list": configList,
+					"filed_list":  FiledList,
+					"status":      1,
+				})
+			}
+
+		} else {
+			this.ServeSuccessJSON(map[string]interface{}{
+				"org":    org,
+				"status": 2,
+			})
+
+		}
 
 	}
 

controllers/new_mobile_api_controllers/new_mobile_api_router_register.go

@@ -34,11 +34,20 @@ func NewMobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/createOrg", &HomeController{}, "post:CreateOrg")
 
 	beego.Router("/m/api/staff", &NewRoleApiController{}, "get:GetAllOrgUser")
-	//beego.Router("/m/api/staff/edit", &NewRoleApiController{}, "post:EditAdmin")
-	//beego.Router("/m/api/staff/init", &NewRoleApiController{}, "get:GetEditAdminInitData")
-	//beego.Router("/m/api/staff/get", &NewRoleApiController{}, "get:GetAdminUserInfo")
-	//beego.Router("/m/api/staff/stop", &NewRoleApiController{}, "post:StopAdminUser")
-	//beego.Router("/m/api/staff/create", &NewRoleApiController{}, "post:CreateAdminUser")
+	beego.Router("/m/api/staff/edit", &NewRoleApiController{}, "post:EditAdmin")
+	beego.Router("/m/api/staff/init", &NewRoleApiController{}, "get:GetEditAdminInitData")
+	beego.Router("/m/api/staff/get", &NewRoleApiController{}, "get:GetAdminUserInfo")
+	beego.Router("/m/api/staff/stop", &NewRoleApiController{}, "post:StopAdminUser")
+	beego.Router("/m/api/staff/create", &NewRoleApiController{}, "post:CreateAdminUser")
+
+	beego.Router("/m/api/role", &NewRoleApiController{}, "get:GetAllOrgRole")
+	beego.Router("/m/api/role/edit", &NewRoleApiController{}, "post:EditRole")
+	beego.Router("/m/api/role/get", &NewRoleApiController{}, "get:GetOrgRoleInfo")
+	beego.Router("/m/api/role/del", &NewRoleApiController{}, "get:DeleteOrgRole")
+	beego.Router("/m/api/role/create", &NewRoleApiController{}, "post:CreateRole")
+
+	beego.Router("/m/api/permission/post", &NewRoleApiController{}, "post:EditRolePermission")
+	beego.Router("/m/api/permission", &NewRoleApiController{}, "get:GetAllPermission")
 
 	beego.Router("/m/api/patient/getbloodpatientinfo", &NewDialysisApiController{}, "Get:GetBloodPatientInfo")
 	beego.Router("/m/api/patient/getslowpatientinfo", &NewDialysisApiController{}, "Get:GetSlowPatientInfo")

controllers/new_mobile_api_controllers/new_role_api_controller.go

@@ -1,7 +1,11 @@
 package new_mobile_api_controllers
 
 import (
+	"XT_New/enums"
+	"XT_New/models"
 	"XT_New/service"
+	"strings"
+	"time"
 )
 
 type NewRoleApiController struct {
@@ -17,50 +21,280 @@ func (this *NewRoleApiController) GetAllOrgUser() {
 
 }
 
-//func (this *NewRoleApiController) EditAdmin() {
-//	adminUserInfo := this.GetMobileAdminUserInfo()
-//	adminUserId, _ := this.GetInt64("uid")
-//	name := this.GetString("name")
-//	userTitle := this.GetString("title")
-//	roleIds  := this.GetString("role_ids")
-//
-//	if adminUserId <= 0 || len(name) == 0   || len(roleIds) <= 0 {
-//		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-//		return
-//	}
-//
-//	appRole, getAppRoleErr := service.GetAppRole(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserId)
-//	if getAppRoleErr != nil {
-//		//beego.Error("查询管理员信息时失败:", getAppRoleErr)
-//		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-//		return
-//	}
-//
-//	if appRole == nil {
-//		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdminUserNotExist)
-//		return
-//	}
-//
-//	appRole.UserName = name
-//	appRole.UserType = int8(userType)
-//	appRole.UserTitle = int8(userTitle)
-//	appRole.RoleId = roleId
-//	appRole.Intro = intro
-//	appRole.ModifyTime = time.Now().Unix()
-//	saveErr := service.SaveAppRole(appRole)
-//	if saveErr != nil {
-//		//beego.Error("修改App_Role失败:", saveErr)
-//		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBUpdate)
-//
-//	} else {
-//		this.ServeSuccessJSON(nil)
-//	}
-//
-//
-//
-//
-//
-//
-//
-//
-//}
+func (this *NewRoleApiController) EditAdmin() {
+	adminUserInfo := this.GetMobileAdminUserInfo()
+	adminUserId, _ := this.GetInt64("uid")
+	name := this.GetString("name")
+	userTitle := this.GetString("title")
+	roleIds := this.GetString("role_ids")
+	if adminUserId <= 0 || len(name) == 0 || len(roleIds) <= 0 {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	appRole, getAppRoleErr := service.GetAppRole(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserId)
+	if getAppRoleErr != nil {
+		//beego.Error("查询管理员信息时失败:", getAppRoleErr)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	if appRole == nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdminUserNotExist)
+		return
+	}
+	appRole.UserName = name
+	appRole.UserTitleName = userTitle
+	appRole.RoleIds = roleIds
+	appRole.ModifyTime = time.Now().Unix()
+	saveErr := service.SaveAppRole(appRole)
+	if saveErr != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBUpdate)
+	} else {
+		this.ServeSuccessJSON(nil)
+	}
+}
+
+func (this *NewRoleApiController) GetEditAdminInitData() {
+	adminUserInfo := this.GetMobileAdminUserInfo()
+	roles, _ := service.GetAllOrgValidRoles(adminUserInfo.Org.Id)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"roles": roles,
+	})
+}
+
+func (this *NewRoleApiController) GetAdminUserInfo() {
+	adminUserInfo := this.GetMobileAdminUserInfo()
+	adminUserId, _ := this.GetInt64("uid")
+	appRole, getAppRoleErr := service.GetAppRole(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserId)
+	if getAppRoleErr != nil {
+		//beego.Error("查询管理员信息时失败:", getAppRoleErr)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	if appRole == nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdminUserNotExist)
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"user_info": appRole,
+	})
+
+}
+
+func (this *NewRoleApiController) StopAdminUser() {
+	adminUserInfo := this.GetMobileAdminUserInfo()
+	adminUserId, _ := this.GetInt64("uid")
+	appRole, getAppRoleErr := service.GetAppRole(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserId)
+	if getAppRoleErr != nil {
+		//beego.Error("查询管理员信息时失败:", getAppRoleErr)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	if appRole == nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdminUserNotExist)
+		return
+	}
+
+	enable, _ := this.GetBool("enable")
+
+	if enable {
+		appRole.Status = 1
+	} else {
+		appRole.Status = 0
+	}
+	appRole.ModifyTime = time.Now().Unix()
+	saveErr := service.SaveAppRole(appRole)
+	if saveErr != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBUpdate)
+	} else {
+		this.ServeSuccessJSON(nil)
+	}
+
+}
+
+func (this *NewRoleApiController) CreateAdminUser() {
+	adminUserInfo := this.GetMobileAdminUserInfo()
+	mobile := this.GetString("mobile")
+	name := this.GetString("name")
+	role_ids := this.GetString("role_ids")
+	userTitle := this.GetString("title")
+
+	if len(mobile) == 0 || len(name) == 0 || len(role_ids) <= 0 {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	// 判断是否已存在该手机号
+	if adminUser, err := service.GetValidAdminUserByMobileReturnErr(mobile); err != nil {
+		//beego.Error("查询用户是否已被添加为管理员时失败:", err)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	} else {
+		if adminUser == nil { //新增账号和用户
+			_, password, createErr := service.CreateGeneralAdminUser(adminUserInfo.Org.Id, adminUserInfo.App.Id, mobile, name, userTitle, role_ids)
+			if createErr != nil {
+				//beego.Error("创建管理员失败:", createErr)
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBCreate)
+				return
+
+			} else {
+				sendSMSErr := service.SMSSendInviteMobileToJoinOrgAdmin(name, mobile, password)
+				if sendSMSErr != nil {
+				}
+
+				this.ServeSuccessJSON(nil)
+				return
+			}
+		} else { //新增用户
+			app_role := &models.App_Role{
+				AdminUserId:   adminUser.Id,
+				OrgId:         adminUserInfo.Org.Id,
+				AppId:         adminUserInfo.App.Id,
+				Avatar:        "",
+				UserName:      name,
+				UserTitleName: userTitle,
+				Status:        1,
+				CreateTime:    time.Now().Unix(),
+				ModifyTime:    time.Now().Unix(),
+				RoleIds:       role_ids,
+			}
+
+			err := service.CreateUserRole(app_role)
+			if err != nil {
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBCreate)
+				return
+			}
+			this.ServeSuccessJSON(nil)
+			return
+		}
+	}
+
+}
+
+func (this *NewRoleApiController) GetAllOrgRole() {
+	adminUserInfo := this.GetMobileAdminUserInfo()
+	roles, err := service.GetAllOrgValidRoles(adminUserInfo.Org.Id)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	} else {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"roles": roles,
+		})
+	}
+
+}
+
+func (this *NewRoleApiController) EditRole() {
+
+}
+
+func (this *NewRoleApiController) GetOrgRoleInfo() {
+	role_id, _ := this.GetInt64("id", 0)
+	role, err := service.GetRoleByRoleID(role_id)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	} else {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"role": role,
+		})
+	}
+
+}
+
+func (this *NewRoleApiController) CreateRole() {
+	adminUserInfo := this.GetMobileAdminUserInfo()
+	role_name := this.GetString("name")
+	role_desc := this.GetString("desc")
+
+	role := &models.Role{
+		RoleName:     role_name,
+		RoleIntro:    role_desc,
+		Creator:      adminUserInfo.AdminUser.Id,
+		OrgId:        adminUserInfo.Org.Id,
+		AppId:        adminUserInfo.App.Id,
+		Status:       1,
+		IsSuperAdmin: false,
+		CreateTime:   time.Now().Unix(),
+		ModifyTime:   time.Now().Unix(),
+	}
+
+	err := service.CreateOrgRole(role)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	} else {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"role": role,
+		})
+	}
+
+}
+
+func (this *NewRoleApiController) EditRolePermission() {
+	role_id, _ := this.GetInt64("id", 0)
+	purview_id := this.GetString("purview_id")
+	is_open, _ := this.GetInt64("type", 0)
+
+	permissions, err := service.GetRolePurviewIds(role_id)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	} else {
+
+		if is_open == 1 { //打开
+			permission_arr := strings.Split(permissions, ",")
+			permission_arr = append(permission_arr, purview_id)
+			permissions = strings.Join(permission_arr, ",")
+			//插入数据库
+			purview, _ := service.GetRolePurview(role_id)
+			purview.PurviewIds = permissions
+			err := service.SaveRolePurview(purview)
+			if err != nil {
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+			this.ServeSuccessJSON(map[string]interface{}{
+				"is_open": 1,
+			})
+
+		} else { //关闭
+
+			permission_arr := strings.Split(permissions, ",")
+			for index, id := range permission_arr {
+				if id == purview_id {
+					permission_arr = append(permission_arr[:index], permission_arr[index+1:]...)
+				}
+			}
+			purview, _ := service.GetRolePurview(role_id)
+			purview.PurviewIds = strings.Join(permission_arr, ",")
+
+			err := service.SaveRolePurview(purview)
+			if err != nil {
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+			this.ServeSuccessJSON(map[string]interface{}{
+				"is_open": 0,
+			})
+
+		}
+	}
+}
+
+func (this *NewRoleApiController) GetAllPermission() {
+	module, _ := this.GetInt64("module")
+	parent_id, _ := this.GetInt64("id")
+	purviews, _ := service.GetAllPurview(module, parent_id)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"purviews": purviews,
+	})
+}
+
+func (this *NewRoleApiController) DeleteOrgRole() {
+	//role_id, _ := this.GetInt64("id", 0)
+
+}

controllers/role_controller.go

@@ -362,7 +362,7 @@ func (this *RoleAPIController) AddAdmin() {
 	userType, _ := this.GetInt("type")
 	userTitle, _ := this.GetInt("title")
 	roleId, _ := this.GetInt64("role")
-	intro := this.GetString("intro")
+	//intro := this.GetString("intro")
 
 	_, titleExist := models.UserTitle[userTitle]
 	if len(mobile) == 0 || len(name) == 0 || (userType != 2 && userType != 3 && userType != 4) || !titleExist || roleId <= 0 {
@@ -403,23 +403,24 @@ func (this *RoleAPIController) AddAdmin() {
 		}
 	}
 
-	_, password, createErr := service.CreateGeneralAdminUser(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, mobile, name, userType, userTitle, intro, roleId)
-	if createErr != nil {
-		//beego.Error("创建管理员失败:", createErr)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBCreate)
-		return
-
-	} else {
-		//beego.Trace("用户密码:", password)
-		// 发送短信通知这个手机号
-		sendSMSErr := service.SMSSendInviteMobileToJoinOrgAdmin(name, mobile, password)
-		if sendSMSErr != nil {
-			//beego.Error("发送邀请短信失败：%v", sendSMSErr)
-		}
-
-		this.ServeSuccessJSON(nil)
-		return
-	}
+	//TODO
+	//_, password, createErr := service.CreateGeneralAdminUser(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, mobile, name, userType, userTitle, intro, roleId)
+	//if createErr != nil {
+	//	//beego.Error("创建管理员失败:", createErr)
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBCreate)
+	//	return
+	//
+	//} else {
+	//	//beego.Trace("用户密码:", password)
+	//	// 发送短信通知这个手机号
+	//	sendSMSErr := service.SMSSendInviteMobileToJoinOrgAdmin(name, mobile, password)
+	//	if sendSMSErr != nil {
+	//		//beego.Error("发送邀请短信失败：%v", sendSMSErr)
+	//	}
+	//
+	//	this.ServeSuccessJSON(nil)
+	//	return
+	//}
 }
 
 // /api/admin/editinit [get]

models/role_models.go

@@ -35,19 +35,21 @@ type App_Roles struct {
 }
 
 type App_Role struct {
-	Id          int64  `gorm:"PRIMARY_KEY;AUTO_INCREMENT" json:"id"`
-	AdminUserId int64  `gorm:"column:admin_user_id" json:"admin_user_id"`
-	OrgId       int64  `gorm:"column:org_id" json:"org_id"`
-	AppId       int64  `gorm:"column:app_id" json:"app_id"`
-	RoleId      int64  `gorm:"column:role_id" json:"role_id"`
-	Avatar      string `json:"avatar" json:"avatar"`
-	UserName    string `gorm:"column:user_name" json:"user_name"`   // 用户名称
-	Intro       string `json:"intro"`                               // 简介
-	UserType    int8   `gorm:"column:user_type" json:"user_type"`   // 用户类型（1.管理员；2.医生；3.护士；4.运营）
-	UserTitle   int8   `gorm:"column:user_title" json:"user_title"` // 用户职称（1.医士；2.医师；3.住院医师；4.主治医师；5.副主任医师；6.主任医师；7.护士；8.护师；9.主管护师；10.副主任护师；11.主任护师；12.运营专员；13.运营主管）
-	Status      int8   `json:"status"`                              // 状态 0.无效 1.有效
-	CreateTime  int64  `gorm:"column:ctime" json:"ctime"`           // 创建时间
-	ModifyTime  int64  `gorm:"column:mtime" json:"mtime"`           // 修改时间
+	Id            int64  `gorm:"PRIMARY_KEY;AUTO_INCREMENT" json:"id"`
+	AdminUserId   int64  `gorm:"column:admin_user_id" json:"admin_user_id"`
+	OrgId         int64  `gorm:"column:org_id" json:"org_id"`
+	AppId         int64  `gorm:"column:app_id" json:"app_id"`
+	RoleId        int64  `gorm:"column:role_id" json:"role_id"`
+	Avatar        string `json:"avatar" json:"avatar"`
+	UserName      string `gorm:"column:user_name" json:"user_name"`   // 用户名称
+	Intro         string `json:"intro"`                               // 简介
+	UserType      int8   `gorm:"column:user_type" json:"user_type"`   // 用户类型（1.管理员；2.医生；3.护士；4.运营）
+	UserTitle     int8   `gorm:"column:user_title" json:"user_title"` // 用户职称（1.医士；2.医师；3.住院医师；4.主治医师；5.副主任医师；6.主任医师；7.护士；8.护师；9.主管护师；10.副主任护师；11.主任护师；12.运营专员；13.运营主管）
+	Status        int8   `json:"status"`                              // 状态 0.无效 1.有效
+	CreateTime    int64  `gorm:"column:ctime" json:"ctime"`           // 创建时间
+	ModifyTime    int64  `gorm:"column:mtime" json:"mtime"`           // 修改时间UserTitleName string `gorm:"column:user_title_name" json:"user_title_name" form:"user_title_name"`
+	UserTitleName string `gorm:"column:user_title_name" json:"user_title_name" form:"user_title_name"`
+	RoleIds       string `gorm:"column:role_ids" json:"role_ids" form:"role_ids"`
 }
 
 func (App_Role) TableName() string {

service/role_service.go

@@ -259,7 +259,7 @@ func IsUserSuperAdminWithMobile(mobile string) (bool, error) {
 	return user.IsSuperAdmin, nil
 }
 
-func CreateGeneralAdminUser(orgID int64, appID int64, mobile string, name string, userType int, userTitle int, intro string, roleID int64) (*models.AdminUser, string, error) {
+func CreateGeneralAdminUser(orgID int64, appID int64, mobile string, name string, userTitle string, roleIds string) (*models.AdminUser, string, error) {
 	now := time.Now().Unix()
 	tx := writeUserDb.Begin()
 	var adminUser models.AdminUser
@@ -283,18 +283,16 @@ func CreateGeneralAdminUser(orgID int64, appID int64, mobile string, name string
 		}
 	}
 	app_role := models.App_Role{
-		AdminUserId: adminUser.Id,
-		OrgId:       orgID,
-		AppId:       appID,
-		RoleId:      roleID,
-		Avatar:      "",
-		UserName:    name,
-		Intro:       intro,
-		UserType:    int8(userType),
-		UserTitle:   int8(userTitle),
-		Status:      1,
-		CreateTime:  now,
-		ModifyTime:  now,
+		AdminUserId:   adminUser.Id,
+		OrgId:         orgID,
+		AppId:         appID,
+		Avatar:        "",
+		UserName:      name,
+		UserTitleName: userTitle,
+		Status:        1,
+		CreateTime:    now,
+		ModifyTime:    now,
+		RoleIds:       roleIds,
 	}
 	if createApp_RoleErr := tx.Create(&app_role).Error; createApp_RoleErr != nil {
 		tx.Rollback()
@@ -413,3 +411,52 @@ func GetOrgApp(orgID int64, app_type int) (*models.OrgApp, error) {
 	}
 	return &apps, nil
 }
+
+func GetAllOrgValidRoles(orgID int64) ([]*models.Role, error) {
+	var roles []*models.Role
+	err := readUserDb.Model(models.Role{}).
+		Where("org_id = ? AND status = 1", orgID).
+		Order("ctime asc").
+		Find(&roles).
+		Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return make([]*models.Role, 0), nil
+		} else {
+			return nil, err
+		}
+	}
+	return roles, nil
+}
+
+func CreateUserRole(userRole *models.App_Role) (err error) {
+	err = writeUserDb.Create(&userRole).Error
+	return
+}
+
+func CreateOrgRole(role *models.Role) (err error) {
+	err = writeUserDb.Create(&role).Error
+	return
+}
+
+func GetRolePurview(roleID int64) (*models.RolePurview, error) {
+	var rolePurviews *models.RolePurview
+	err := readUserDb.Where("role_id = ?", roleID).First(&rolePurviews).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
+		}
+	}
+	return rolePurviews, nil
+}
+
+func SaveRolePurview(purview *models.RolePurview) (err error) {
+	err = writeUserDb.Save(purview).Error
+	return
+}
+
+func GetAllPurview(module int64, pid int64) ([]*models.Purview, error) {
+	var originPurviews []*models.Purview
+	getPurviewErr := readUserDb.Model(models.Purview{}).Where("module = ? AND status = 1 AND parentid = ?", module, pid).Order("listorder asc").Order("id asc").Find(&originPurviews).Error
+	return originPurviews, getPurviewErr
+}