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

controllers/new_mobile_api_controllers/new_mobile_api_router_register.go

@@ -52,6 +52,7 @@ func NewMobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/permission/post", &NewRoleApiController{}, "post:EditRolePermission")
 	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/patient/getbloodpatientinfo", &NewDialysisApiController{}, "Get:GetBloodPatientInfo")
 	beego.Router("/m/api/patient/getslowpatientinfo", &NewDialysisApiController{}, "Get:GetSlowPatientInfo")

controllers/new_mobile_api_controllers/new_role_api_controller.go

@@ -366,8 +366,10 @@ func (this *NewRoleApiController) GetRolePurviews() {
 	adminUserInfo := this.GetMobileAdminUserInfo()
 	role_id, _ := this.GetInt64("id", 0)
 	rolePurview, _ := service.GetRoleAndPurviewById(role_id, adminUserInfo.Org.Id, adminUserInfo.App.Id)
+	role, _ := service.GetRoleByRoleID(role_id)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"role_purview": rolePurview,
+		"role":         role,
 	})
 }
 
@@ -387,3 +389,10 @@ func (this *NewRoleApiController) AddRoleStaff() {
 	})
 
 }
+
+func (this *NewRoleApiController) GetFuntionPurviews() {
+	functionPurview, _ := service.GetFunctionPurview()
+	this.ServeSuccessJSON(map[string]interface{}{
+		"funtion_purview": functionPurview,
+	})
+}

models/purview_models.go

@@ -39,3 +39,19 @@ type RolePurview struct {
 func (RolePurview) TableName() string {
 	return "sgj_user_role_purview"
 }
+
+type SgjUserOperatePurview struct {
+	ID       int64  `gorm:"column:id" json:"id" form:"id"`
+	Module   int64  `gorm:"column:module" json:"module" form:"module"`
+	Name     string `gorm:"column:name" json:"name" form:"name"`
+	Urlfor   string `gorm:"column:urlfor" json:"urlfor" form:"urlfor"`
+	Parentid int64  `gorm:"column:parentid" json:"parentid" form:"parentid"`
+	ErrorMsg string `gorm:"column:error_msg" json:"error_msg" form:"error_msg"`
+	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 (SgjUserOperatePurview) TableName() string {
+	return "sgj_user_operate_purview"
+}

service/role_service.go

@@ -539,3 +539,8 @@ func SaveAdminUser(role *models.App_Role) (err error) {
 	err = writeUserDb.Save(&role).Error
 	return
 }
+
+func GetFunctionPurview() (purview []*models.SgjUserOperatePurview, err error) {
+	err = readUserDb.Model(&models.SgjUserOperatePurview{}).Where("status = 1 ").Find(&purview).Error
+	return
+}