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

controllers/base_api_controller.go

@@ -62,37 +62,37 @@ type BaseAuthAPIController struct {
 func (this *BaseAuthAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		var userAdmin models.AdminUser
-		userAdmin.Id = 380
-		userAdmin.Mobile = "13532250447"
-		userAdmin.IsSuperAdmin = true
-		userAdmin.Status = 1
-		userAdmin.CreateTime = 1530786071
-		userAdmin.ModifyTime = 1530786071
-		var subscibe models.ServeSubscibe
-		subscibe.ID = 1
-		subscibe.OrgId = 4
-		subscibe.PeriodStart = 1538035409
-		subscibe.PeriodEnd = 1569571409
-		subscibe.State = 1
-		subscibe.Status = 1
-		subscibe.CreatedTime = 1538035409
-		subscibe.UpdatedTime = 1538035409
-		subscibes := make(map[int64]*models.ServeSubscibe, 0)
-		subscibes[4] = &subscibe
-
-		var template models.GobalTemplate
-		template.TemplateId = 2
-
-		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 4
-		adminUserInfo.CurrentAppId = 5
-		adminUserInfo.AdminUser = &userAdmin
-		adminUserInfo.Subscibes = subscibes
-		this.SetSession("admin_user_info", &adminUserInfo)
-
-		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		//this.StopRun()
+		//var userAdmin models.AdminUser
+		//userAdmin.Id = 380
+		//userAdmin.Mobile = "13532250447"
+		//userAdmin.IsSuperAdmin = true
+		//userAdmin.Status = 1
+		//userAdmin.CreateTime = 1530786071
+		//userAdmin.ModifyTime = 1530786071
+		//var subscibe models.ServeSubscibe
+		//subscibe.ID = 1
+		//subscibe.OrgId = 4
+		//subscibe.PeriodStart = 1538035409
+		//subscibe.PeriodEnd = 1569571409
+		//subscibe.State = 1
+		//subscibe.Status = 1
+		//subscibe.CreatedTime = 1538035409
+		//subscibe.UpdatedTime = 1538035409
+		//subscibes := make(map[int64]*models.ServeSubscibe, 0)
+		//subscibes[4] = &subscibe
+		//
+		//var template models.GobalTemplate
+		//template.TemplateId = 2
+		//
+		//var adminUserInfo service.AdminUserInfo
+		//adminUserInfo.CurrentOrgId = 4
+		//adminUserInfo.CurrentAppId = 5
+		//adminUserInfo.AdminUser = &userAdmin
+		//adminUserInfo.Subscibes = subscibes
+		//this.SetSession("admin_user_info", &adminUserInfo)
+
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		this.StopRun()
 	}
 
 	//if this.Ctx.Request.Method != "GET" {
@@ -106,8 +106,15 @@ func (this *BaseAuthAPIController) Prepare() {
 	//}
 
 	//if this.Ctx.Request.Header.Get("Permission") == "1" {
-	//
 	//	isPermission := false
+	//
+	//	//adminUserInfo := this.GetAdminUserInfo()
+	//
+	//	//service.GetUserAllRole(adminUserInfo.CurrentOrgId)
+	//
+	//
+	//
+	//
 	//	roles := []int64{1,2}		//模拟该用户有多少角色
 	//	var targetRole models.RolePurview
 	//	var userRolePurview []string

controllers/mobile_api_controllers/mobile_api_base_controller.go

@@ -4,7 +4,10 @@ import (
 	"XT_New/controllers"
 	"XT_New/enums"
 	"XT_New/models"
+	"XT_New/service"
 	"fmt"
+	"strconv"
+	"strings"
 )
 
 type MobileBaseAPIController struct {
@@ -60,4 +63,73 @@ func (this *MobileBaseAPIAuthController) Prepare() {
 	//		this.StopRun()
 	//	}
 	//}
+
+	if this.Ctx.Request.Header.Get("Permission") == "1" {
+		isPermission := false
+		adminUserInfo := this.GetMobileAdminUserInfo()
+		//该机构下该用户有多少个
+		role, _ := service.GetUserAllRole(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id)
+		var roles []string
+		if len(role.RoleIds) <= 0 { //该用户没有设置角色
+
+		} else {
+			roles = strings.Split(role.RoleIds, ",")
+		}
+
+		//获取该用户下所有角色的权限总集
+		var userRolePurviews string
+		var userRolePurviewsArr []string
+		for _, item := range roles {
+			role_id, _ := strconv.ParseInt(item, 10, 64)
+			purviews, _ := service.GetRoleFuncPurviewIds(role_id)
+			userRolePurviews = userRolePurviews + purviews
+		}
+		//该用户所拥有角色的权限的总集
+		userRolePurviewsArr = RemoveRepeatedPurviewElement(strings.Split(userRolePurviews, ","))
+		//系统所记录的权限列表
+		allPermission, _ := service.GetAllFunctionPurview()
+
+		//fmt.Println(this.Ctx.Request.RequestURI[1])
+
+		for _, item := range allPermission {
+			//判断当前路由是否在权限路由列表里面
+			if strings.Split(item.Urlfor, ",")[0] == strings.Split(this.Ctx.Request.RequestURI, "?")[0]+"?"+"mode="+this.GetString("mode") {
+				//获取该角色的所有权限
+				for _, items := range userRolePurviewsArr {
+					id, _ := strconv.ParseInt(items, 10, 64)
+					if id == item.ID {
+						isPermission = true
+					}
+				}
+				if !isPermission {
+					msg, _ := service.FindErrorMsgByStr(strings.Split(this.Ctx.Request.RequestURI, "?")[0] + "?" + "mode=" + this.GetString("mode"))
+					json := make(map[string]interface{})
+					json["msg"] = msg
+					json["code"] = 0
+					json["state"] = 0
+					this.Data["json"] = json
+					this.ServeJSON()
+					this.StopRun()
+				}
+			}
+		}
+	}
+
+}
+
+func RemoveRepeatedPurviewElement(arr []string) (newArr []string) {
+	newArr = make([]string, 0)
+	for i := 0; i < len(arr); i++ {
+		repeat := false
+		for j := i + 1; j < len(arr); j++ {
+			if arr[i] == arr[j] {
+				repeat = true
+				break
+			}
+		}
+		if !repeat {
+			newArr = append(newArr, arr[i])
+		}
+	}
+	return
 }

controllers/new_mobile_api_controllers/home_api_controller.go

@@ -158,6 +158,23 @@ func (this *HomeController) ChangeOrg() {
 			TemplateInfo: &templateInfo,
 		}
 
+		if org != nil && appRole != nil {
+			// 插入一条登录记录
+			ip := this.GetString("ip")
+			loginLog := &models.AdminUserLoginLog{
+				AdminUserId: adminUser.Id,
+				OrgId:       org.Id,
+				AppId:       appRole.AppId,
+				IP:          ip,
+				OperateType: 3,
+				AppType:     3,
+				CreateTime:  time.Now().Unix(),
+			}
+			if insertErr := service.InsertLoginLog(loginLog); insertErr != nil {
+				utils.ErrorLog("为手机号为%v的用户插入一条登录记录失败：%v", mobile, insertErr)
+			}
+		}
+
 		//删除session和cookie
 		this.DelSession("mobile_admin_user_info")
 		this.Ctx.SetCookie("token_cookie", "")

controllers/new_mobile_api_controllers/new_mobile_api_router_register.go

@@ -50,10 +50,14 @@ func NewMobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/role/create", &NewRoleApiController{}, "post:CreateRole")
 
 	beego.Router("/m/api/permission/post", &NewRoleApiController{}, "post:EditRolePermission")
+	beego.Router("/m/api/functionpermission/post", &NewRoleApiController{}, "post:EditFunctionPermission")
+
 	beego.Router("/m/api/permission", &NewRoleApiController{}, "get:GetAllPermission")
 	beego.Router("/m/api/rolepurview", &NewRoleApiController{}, "get:GetRolePurviews")
 	beego.Router("/m/api/role/funtionpurview", &NewRoleApiController{}, "get:GetFuntionPurviews")
 
+	beego.Router("/m/api/func_role/get", &NewRoleApiController{}, "get:GetFuncRolePurviews")
+
 	beego.Router("/m/api/patient/getbloodpatientinfo", &NewDialysisApiController{}, "Get:GetBloodPatientInfo")
 	beego.Router("/m/api/patient/getslowpatientinfo", &NewDialysisApiController{}, "Get:GetSlowPatientInfo")
 	beego.Router("/m/api/patient/getmemberpatientinfo", &NewDialysisApiController{}, "Get:GetMemberpatientInfo")

controllers/new_mobile_api_controllers/new_role_api_controller.go

@@ -4,6 +4,7 @@ import (
 	"XT_New/enums"
 	"XT_New/models"
 	"XT_New/service"
+	"fmt"
 	"strconv"
 	"strings"
 	"time"
@@ -257,59 +258,6 @@ func (this *NewRoleApiController) CreateRole() {
 
 }
 
-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")
@@ -396,3 +344,207 @@ func (this *NewRoleApiController) GetFuntionPurviews() {
 		"funtion_purview": functionPurview,
 	})
 }
+
+func RemoveRepeatedIDSElement(arr []string) (newArr []string) {
+	newArr = make([]string, 0)
+	for i := 0; i < len(arr); i++ {
+		repeat := false
+		for j := i + 1; j < len(arr); j++ {
+			if arr[i] == arr[j] {
+				repeat = true
+				break
+			}
+		}
+		if !repeat {
+			newArr = append(newArr, arr[i])
+		}
+	}
+	return
+}
+
+func (this *NewRoleApiController) EditRolePermission() {
+	adminUser := this.GetMobileAdminUserInfo()
+	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 { //打开
+			purview, _ := service.GetRolePurview(role_id)
+			if purview.Id == 0 { // 新建
+
+				purview.PurviewIds = purview_id
+				purview.CreateTime = time.Now().Unix()
+				purview.ModifyTime = time.Now().Unix()
+				purview.Status = 1
+				purview.RoleId = role_id
+				purview.OrgId = adminUser.Org.Id
+				purview.AppId = adminUser.App.Id
+				err := service.CreateRolePurview(&purview)
+				if err != nil {
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+
+				this.ServeSuccessJSON(map[string]interface{}{
+					"is_open": 1,
+				})
+
+			} else { //修改
+				var permission_arr []string
+				purview, _ := service.GetRolePurview(role_id)
+				if len(permissions) > 0 {
+					permission_arr = strings.Split(permissions, ",")
+					if len(purview_id) > 0 {
+						permission_arr = append(permission_arr, strings.Split(purview_id, ",")...)
+					}
+				} else {
+					if len(purview_id) > 0 {
+						permission_arr = strings.Split(purview_id, ",")
+					}
+				}
+
+				permission_arr = RemoveRepeatedIDSElement(permission_arr)
+				permissions = strings.Join(permission_arr, ",")
+				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, ",")
+			purview_arr := strings.Split(purview_id, ",")
+
+			for _, pur_id := range purview_arr {
+				for index, id := range permission_arr {
+					if id == pur_id {
+						permission_arr = append(permission_arr[:index], permission_arr[index+1:]...)
+					}
+				}
+			}
+			purview, _ := service.GetRolePurview(role_id)
+			fmt.Println(purview.CreateTime)
+			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) EditFunctionPermission() {
+	adminUser := this.GetMobileAdminUserInfo()
+	role_id, _ := this.GetInt64("id", 0)
+	purview_id := this.GetString("purview_id")
+	is_open, _ := this.GetInt64("type", 0)
+
+	permissions, err := service.GetRoleFuncPurviewIds(role_id)
+
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	} else {
+
+		if is_open == 1 { //打开
+			purview, _ := service.GetFuncRolePurview(role_id)
+			if purview.ID == 0 { // 新建
+
+				purview.PurviewIds = purview_id
+				purview.Ctime = time.Now().Unix()
+				purview.Mtime = time.Now().Unix()
+				purview.Status = 1
+				purview.RoleId = role_id
+				purview.OrgId = adminUser.Org.Id
+				purview.AppId = adminUser.App.Id
+				err := service.CreateFuncRolePurview(&purview)
+				if err != nil {
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+
+				this.ServeSuccessJSON(map[string]interface{}{
+					"is_open": 1,
+				})
+			} else { //修改
+				var permission_arr []string
+				purview, _ := service.GetRoleFuncPurview(role_id)
+				if len(permissions) > 0 {
+					permission_arr = strings.Split(permissions, ",")
+					if len(purview_id) > 0 {
+						permission_arr = append(permission_arr, strings.Split(purview_id, ",")...)
+					}
+				} else {
+					if len(purview_id) > 0 {
+						permission_arr = strings.Split(purview_id, ",")
+					}
+				}
+				permission_arr = RemoveRepeatedIDSElement(permission_arr)
+				permissions = strings.Join(permission_arr, ",")
+				purview.PurviewIds = permissions
+
+				err := service.SaveRoleFuncPurview(&purview)
+				if err != nil {
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+				this.ServeSuccessJSON(map[string]interface{}{
+					"is_open": 1,
+				})
+			}
+		} else { //关闭
+			permission_arr := strings.Split(permissions, ",")
+			purview_arr := strings.Split(purview_id, ",")
+
+			for index, id := range permission_arr {
+				for _, pur_id := range purview_arr {
+					if id == pur_id {
+						permission_arr = append(permission_arr[:index], permission_arr[index+1:]...)
+					}
+				}
+			}
+			purview, _ := service.GetRoleFuncPurview(role_id)
+			purview.PurviewIds = strings.Join(permission_arr, ",")
+
+			err := service.SaveRoleFuncPurview(&purview)
+			if err != nil {
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			this.ServeSuccessJSON(map[string]interface{}{
+				"is_open": 0,
+			})
+
+		}
+	}
+
+}
+
+func (this *NewRoleApiController) GetFuncRolePurviews() {
+	//adminUserInfo := this.GetMobileAdminUserInfo()
+	role_id, _ := this.GetInt64("id", 0)
+	purview, _ := service.GetRoleFuncPurview(role_id)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"role_purview": purview,
+	})
+}

controllers/verify_login_controller.go

@@ -118,7 +118,6 @@ func (this *VerifyUserLoginAPIController) VerifyToken() {
 
 		} else {
 			adminUser := adminUserInfo.AdminUser
-			fmt.Println("adminUser", adminUser)
 			appRole := adminUserInfo.AppRoles[adminUserInfo.CurrentAppId]
 			userInfo := map[string]interface{}{
 				"id":         adminUser.Id,
@@ -161,52 +160,53 @@ func (this *VerifyUserLoginAPIController) VerifyToken() {
 					utils.ErrorLog("字段批量插入失败：%v", err)
 				}
 			}
-			curApp := adminUserInfo.OrgApps[adminUserInfo.CurrentOrgId][adminUserInfo.CurrentAppId]
-			if curApp.OpenStatus != 1 {
-				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNeverCreateTypeApp)
-				return
-			}
+			//curApp := adminUserInfo.OrgApps[adminUserInfo.CurrentOrgId][adminUserInfo.CurrentAppId]
+			//if curApp.OpenStatus != 1 {
+			//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNeverCreateTypeApp)
+			//	return
+			//}
 
 			curAppUrlfors := adminUserInfo.AppUrlfors[adminUserInfo.CurrentAppId]
 
-			subscibe := adminUserInfo.Subscibes[adminUserInfo.CurrentOrgId]
-			fmt.Println("subscibe", subscibe)
-			if err := service.GetOrgSubscibeState(subscibe); err != nil {
-				this.ErrorLog("没有机构订阅信息，数据有误")
-				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
-			}
-
-			orgApps := adminUserInfo.OrgApps[curOrg.Id]
-			didRegistedForSCRM := false
-			didRegistedForMall := false
-			didRegistedForCDM := false
-			for _, app := range orgApps {
-				if app.AppType == 1 && app.OpenStatus == 1 {
-					didRegistedForSCRM = true
-				}
-				if app.AppType == 4 && app.OpenStatus == 1 {
-					didRegistedForCDM = true
-				}
-				if app.AppType == 5 && app.OpenStatus == 1 {
-					didRegistedForMall = true
-				}
-			}
+			//subscibe := adminUserInfo.Subscibes[adminUserInfo.CurrentOrgId]
+			//fmt.Println("subscibe", subscibe)
+			//if err := service.GetOrgSubscibeState(subscibe); err != nil {
+			//	this.ErrorLog("没有机构订阅信息，数据有误")
+			//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			//	return
+			//}
+
+			//orgApps := adminUserInfo.OrgApps[curOrg.Id]
+			//didRegistedForSCRM := false
+			//didRegistedForMall := false
+			//didRegistedForCDM := false
+			//for _, app := range orgApps {
+			//	if app.AppType == 1 && app.OpenStatus == 1 {
+			//		didRegistedForSCRM = true
+			//	}
+			//	if app.AppType == 4 && app.OpenStatus == 1 {
+			//		didRegistedForCDM = true
+			//	}
+			//	if app.AppType == 5 && app.OpenStatus == 1 {
+			//		didRegistedForMall = true
+			//	}
+			//}
+			//service.GetOrgSub
 
 			this.SetSession("admin_user_info", adminUserInfo)
 
 			this.ServeSuccessJSON(map[string]interface{}{
-				"user":            userInfo,
-				"org":             org,
-				"urlfors":         curAppUrlfors,
-				"current_org_id":  adminUserInfo.CurrentOrgId,
-				"current_app_id":  adminUserInfo.CurrentAppId,
-				"subscibe":        subscibe,
-				"scrm_role_exist": didRegistedForSCRM,
-				"cdm_role_exist":  didRegistedForCDM,
-				"mall_role_exist": didRegistedForMall,
-				"template_info":   template_info,
-				"fileds":          FiledList,
+				"user":           userInfo,
+				"org":            org,
+				"urlfors":        curAppUrlfors,
+				"current_org_id": adminUserInfo.CurrentOrgId,
+				"current_app_id": adminUserInfo.CurrentAppId,
+				//"subscibe":        subscibe,
+				//"scrm_role_exist": didRegistedForSCRM,
+				//"cdm_role_exist":  didRegistedForCDM,
+				//"mall_role_exist": didRegistedForMall,
+				"template_info": template_info,
+				"fileds":        FiledList,
 			})
 			return
 		}

models/purview_models.go

@@ -28,10 +28,10 @@ type RolePurview struct {
 	RoleId     int64
 	OrgId      int64
 	AppId      int64
-	PurviewIds string
-	Status     int8  // 状态 0.无效 1.有效 2.禁用
-	CreateTime int64 `gorm:"column:ctime"` // 创建时间
-	ModifyTime int64 `gorm:"column:mtime"` // 修改时间
+	PurviewIds string `gorm:"column:purview_ids"`
+	Status     int8   // 状态 0.无效 1.有效 2.禁用
+	CreateTime int64  `gorm:"column:ctime"` // 创建时间
+	ModifyTime int64  `gorm:"column:mtime"` // 修改时间
 
 	Role Role `gorm:"ForeignKey:RoleId;AssociationForeignKey:ID" json:"role_info"`
 }

models/role_models.go

@@ -80,3 +80,18 @@ var UserTitle = map[int]string{
 	12: "运营专员",
 	13: "运营主管",
 }
+
+type SgjUserRoleFuncPurview struct {
+	ID         int64  `gorm:"column:id" json:"id" form:"id"`
+	OrgId      int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	AppId      int64  `gorm:"column:app_id" json:"app_id" form:"app_id"`
+	RoleId     int64  `gorm:"column:role_id" json:"role_id" form:"role_id"`
+	PurviewIds string `gorm:"column:purview_ids" json:"purview_ids" form:"purview_ids"`
+	Status     int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime      int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime      int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+}
+
+func (SgjUserRoleFuncPurview) TableName() string {
+	return "sgj_user_role_func_purview"
+}

service/role_service.go

@@ -445,19 +445,32 @@ func CreateOrgRole(role *models.Role) (err 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 GetRolePurview(roleID int64) (models.RolePurview, error) {
+	var rolePurviews models.RolePurview
+	var err error
+	err = readUserDb.Where("role_id = ?", roleID).First(&rolePurviews).Error
+	return rolePurviews, err
+}
+
+func GetFuncRolePurview(roleID int64) (models.SgjUserRoleFuncPurview, error) {
+	var rolePurviews models.SgjUserRoleFuncPurview
+	var err error
+	err = readUserDb.Where("role_id = ?", roleID).First(&rolePurviews).Error
+	return rolePurviews, err
 }
 
 func SaveRolePurview(purview *models.RolePurview) (err error) {
-	err = writeUserDb.Save(purview).Error
+	err = writeUserDb.Save(&purview).Error
+	return
+}
+
+func CreateRolePurview(purview *models.RolePurview) (err error) {
+	err = writeUserDb.Create(&purview).Error
+	return
+}
+
+func CreateFuncRolePurview(purview *models.SgjUserRoleFuncPurview) (err error) {
+	err = writeUserDb.Create(&purview).Error
 	return
 }
 
@@ -544,3 +557,44 @@ func GetFunctionPurview() (purview []*models.SgjUserOperatePurview, err error) {
 	err = readUserDb.Model(&models.SgjUserOperatePurview{}).Where("status = 1 ").Find(&purview).Error
 	return
 }
+
+func GetRoleFuncPurviewIds(roleID int64) (string, error) {
+	var rolePurview models.SgjUserRoleFuncPurview
+	err := readUserDb.Where("role_id = ?", roleID).First(&rolePurview).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return "", nil
+		} else {
+			return "", err
+		}
+	}
+	return rolePurview.PurviewIds, nil
+}
+
+func GetRoleFuncPurview(roleID int64) (rolePurviews models.SgjUserRoleFuncPurview, err error) {
+	err = readUserDb.Where("role_id = ?", roleID).First(&rolePurviews).Error
+	return
+}
+
+func SaveRoleFuncPurview(purview *models.SgjUserRoleFuncPurview) (err error) {
+	err = writeUserDb.Save(purview).Error
+	return
+}
+
+func GetUserAllRole(org_id int64, admin_user_id int64) (role models.App_Role, err error) {
+	err = readUserDb.Model(&models.App_Role{}).Where("status = 1 AND org_id = ? AND admin_user_id = ?", org_id, admin_user_id).First(&role).Error
+	return
+}
+
+func GetAllFunctionPurview() (purview []models.SgjUserOperatePurview, err error) {
+	err = readUserDb.Model(&models.SgjUserOperatePurview{}).Where("status = 1 ").Find(&purview).Error
+	return
+}
+
+func FindErrorMsgByStr(str string) (string, error) {
+	var purview models.SgjUserOperatePurview
+	var err error
+	err = readUserDb.Model(&models.SgjUserOperatePurview{}).Where("find_in_set(?, urlfor)", str).First(&purview).Error
+	return purview.ErrorMsg, err
+
+}

service/verify_login_token_service.go

@@ -148,11 +148,11 @@ func processAdminUserInfo(data map[string]interface{}) *AdminUserInfo {
 	orgs := processOrgs(data)
 	orgAppIds := processOrgAppIds(data)
 	orgApps := processOrgApps(data)
-	app2OrgIds := processApp2OrgIds(data)
+	//app2OrgIds := processApp2OrgIds(data)
 	appRoles := processAppRoles(data)
 	appPurviews := processPurviews(data)
 	appUrlfors := processPurviewUrlfors(data)
-	orgSubscibes := processOrgSubscibes(data)
+	//orgSubscibes := processOrgSubscibes(data)
 	sessionAdminUserInfo := &AdminUserInfo{
 		AdminUser:    adminUser,
 		CurrentOrgId: currentOrgId,
@@ -161,11 +161,11 @@ func processAdminUserInfo(data map[string]interface{}) *AdminUserInfo {
 		Orgs:         orgs,
 		OrgAppIds:    orgAppIds,
 		OrgApps:      orgApps,
-		App2OrgIds:   app2OrgIds,
-		AppRoles:     appRoles,
-		AppPurviews:  appPurviews,
-		AppUrlfors:   appUrlfors,
-		Subscibes:    orgSubscibes,
+		//App2OrgIds:   app2OrgIds,
+		AppRoles:    appRoles,
+		AppPurviews: appPurviews,
+		AppUrlfors:  appUrlfors,
+		//Subscibes:    orgSubscibes,
 	}
 	return sessionAdminUserInfo
 }