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

controllers/mobile_api_controllers/mobile_api_base_controller.go

 	//		this.StopRun()
 	//	}
 	//}
+
 	if adminUserInfo.AppRole != nil {
-		app_role, _ := service.FindAppRoleById(adminUserInfo.AppRole.Id)
-		if app_role.Status != 1 {
-			this.DelSession("mobile_admin_user_info")
-			this.Ctx.SetCookie("token_cookie", "")
-			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeForbidden)
-			this.StopRun()
+		if adminUserInfo.AppRole.Id > 0 {
+			app_role, _ := service.FindAppRoleById(adminUserInfo.AppRole.Id)
+			if app_role != nil {
+				if app_role.Status != 1 {
+					this.DelSession("mobile_admin_user_info")
+					this.Ctx.SetCookie("token_cookie", "")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeForbidden)
+					this.StopRun()
+				}
+			}
 		}
 
 	}

controllers/role_controller.go

 package controllers
 
 import (
+	"github.com/jinzhu/gorm"
 	"strconv"
 	"strings"
 	"time"
 func (this *RoleAPIController) CreateRole() {
 	name := this.GetString("name")
 	intro := this.GetString("intro")
-	if len(name) == 0 || len(intro) == 0 {
+	if len(name) == 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
 	}
 
 	if enable == false {
-		if count, _ := service.RoleAdminUserCount(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, roleID); count != 0 {
+		if count, _ := service.RoleAdminUserCountTwo(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, roleID); count != 0 {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCannotRemoveRole)
 			return
 		}
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	purviews, getPurviewsErr := service.GetAllGeneralPurviewVMsProcessed()
+
+	role, _ := service.GetRoleByRoleID(roleId)
+
+	purviews_xt, getPurviewsErr := service.GetAllGeneralPurviewVMsProcessed(3)
+	purviews_scrm, getPurviewsErr := service.GetAllGeneralPurviewVMsProcessed(6)
+	purviews_cdm, getPurviewsErr := service.GetAllGeneralPurviewVMsProcessed(4)
+	purviews_mall, getPurviewsErr := service.GetAllGeneralPurviewVMsProcessed(7)
+
+	purviews_func, getPurviewsErr := service.GetAllGeneralFuncPurviewVMsProcessed()
+	for _, item := range purviews_xt {
+		for _, childItem := range item.Childs {
+			if childItem.Name == "透析记录" {
+				childItem.Childs = purviews_func
+			}
+		}
+	}
+	scrm := &service.PurviewTreeViewModel{
+		ID:     0,
+		PID:    0,
+		Name:   "SCRM",
+		Number: 3,
+		Childs: purviews_scrm,
+	}
+
+	cdm := &service.PurviewTreeViewModel{
+		ID:     0,
+		PID:    0,
+		Number: 3,
+		Name:   "慢病管理",
+		Childs: purviews_cdm,
+	}
+
+	purviews_xt = append(purviews_xt, scrm)
+	purviews_xt = append(purviews_xt, cdm)
+	purviews_xt = append(purviews_xt, purviews_mall...)
+
+	//purviews_xt = append(purviews_xt,purviews_cdm...)
+
 	if getPurviewsErr != nil {
 		//beego.Error("获取所有权限时出错:", getPurviewsErr)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return
 	}
 
+	roleFuncPurview, getFuncRPIdsErr := service.GetRoleFuncPurview(roleId)
+	if getFuncRPIdsErr == gorm.ErrRecordNotFound {
+		//beego.Error("获取角色的权限时出错:", getRPIdsErr)
+		if roleFuncPurview.ID == 0 {
+			rolePurviewIdStr = rolePurviewIdStr
+
+		} else {
+			rolePurviewIdStr = rolePurviewIdStr + "," + roleFuncPurview.PurviewIds
+		}
+	} else if getFuncRPIdsErr != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+
+	} else {
+		if roleFuncPurview.ID == 0 {
+			rolePurviewIdStr = rolePurviewIdStr
+		} else {
+			rolePurviewIdStr = rolePurviewIdStr + "," + roleFuncPurview.PurviewIds
+		}
+	}
+
 	this.ServeSuccessJSON(map[string]interface{}{
-		"purviews":         purviews,
-		"role_purview_ids": rolePurviewIdStr,
+		"purviews":         purviews_xt,
+		"role":             role,
+		"role_purview_ids": rolePurviewIdStr + "," + roleFuncPurview.PurviewIds,
 	})
 }
 
 // @param purview_ids:string
 func (this *RoleAPIController) EditPurview() {
 	adminUserInfo := this.GetAdminUserInfo()
-	//if adminUserInfo.AdminUser.IsSuperAdmin == false {
-	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePermissionDenied)
-	//	return
-	//}
 	roleId, _ := this.GetInt64("role_id")
 	purviewIds := this.GetString("purview_ids")
+	funcPurviewIds := this.GetString("func_purview_ids")
+
 	if roleId <= 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
 
 	err := service.SaveRolePurviewIds(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, roleId, purviewIds)
+	err = service.SaveFuncRolePurviewIds(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, roleId, funcPurviewIds)
+
 	if err != nil {
 		//beego.Error("设置角色的权限时出错:", err)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBUpdate)

service/role_service.go

 
 import (
 	"database/sql"
-	"fmt"
 	"strconv"
 	"strings"
 	"time"
 	PID    int64                   `json:"pid"`
 	Name   string                  `json:"name"`
 	Childs []*PurviewTreeViewModel `json:"childs"`
+	Number int64                   `json:"number"`
 }
 
-func GetAllGeneralPurviewVMsProcessed() ([]*PurviewTreeViewModel, error) {
+func GetAllGeneralPurviewVMsProcessed(module int) ([]*PurviewTreeViewModel, error) {
 	var originPurviews []*models.Purview
-	getPurviewErr := readUserDb.Model(models.Purview{}).Where("module = 3 AND status = 1 AND super_admin_exclusive = 0").Order("listorder asc").Order("id asc").Find(&originPurviews).Error
+	getPurviewErr := readUserDb.Model(models.Purview{}).Where("module = ? AND status = 1 AND super_admin_exclusive = 0", module).Order("listorder asc").Order("id asc").Find(&originPurviews).Error
 	if getPurviewErr != nil {
 		return nil, getPurviewErr
 	}
 		// warning：下面这个算法只适用最多两层树形结构的菜单，对于两层以上的会丢失掉第三层及其以下的节点
 		// 因为取出 originPurviews 的时候已经排过序了，所以顶级节点肯定最先处理，不需要担心子节点比父节点先处理
 		pvm := &PurviewTreeViewModel{
-			ID:   purview.Id,
-			PID:  purview.Parentid,
-			Name: purview.Name,
+			ID:     purview.Id,
+			PID:    purview.Parentid,
+			Name:   purview.Name,
+			Number: 2,
 		}
 		if purview.Parentid == 0 {
 			purviewVMs = append(purviewVMs, pvm)
 	return purviewVMs, nil
 }
 
+func GetAllGeneralFuncPurviewVMsProcessed() ([]*PurviewTreeViewModel, error) {
+	var originPurviews []*models.SgjUserOperatePurview
+	getPurviewErr := readUserDb.Model(models.SgjUserOperatePurview{}).Where(" status = 1").Order("id asc").Find(&originPurviews).Error
+	if getPurviewErr != nil {
+		return nil, getPurviewErr
+	}
+	// 加工这些规则：树形化
+	purviewVMs := make([]*PurviewTreeViewModel, 0)
+	for _, purview := range originPurviews {
+		// warning：下面这个算法只适用最多两层树形结构的菜单，对于两层以上的会丢失掉第三层及其以下的节点
+		// 因为取出 originPurviews 的时候已经排过序了，所以顶级节点肯定最先处理，不需要担心子节点比父节点先处理
+		pvm := &PurviewTreeViewModel{
+			ID:   purview.ID,
+			PID:  purview.Parentid,
+			Name: purview.Name,
+		}
+		purviewVMs = append(purviewVMs, pvm)
+
+	}
+
+	return purviewVMs, nil
+}
+
 func GetRolePurviewIds(roleID int64) (string, error) {
 	var rolePurview models.RolePurview
 	err := readUserDb.Where("role_id = ?", roleID).First(&rolePurview).Error
 	return tx.Commit().Error
 }
 
+func SaveFuncRolePurviewIds(orgID int64, appID int64, roleID int64, funcPurviewIds string) error {
+	var rolePurview models.SgjUserRoleFuncPurview
+	getRPErr := readUserDb.Where("org_id = ? AND app_id = ? AND role_id = ?", orgID, appID, roleID).First(&rolePurview).Error
+	if getRPErr != nil {
+		if getRPErr == gorm.ErrRecordNotFound {
+			rolePurview = models.SgjUserRoleFuncPurview{
+				RoleId: roleID,
+				OrgId:  orgID,
+				AppId:  appID,
+				Status: 1,
+				Ctime:  time.Now().Unix(),
+			}
+		} else {
+			return getRPErr
+		}
+	}
+	rolePurview.PurviewIds = funcPurviewIds
+	rolePurview.Mtime = time.Now().Unix()
+	tx := writeUserDb.Begin()
+	if err := tx.Save(&rolePurview).Error; err != nil {
+		tx.Rollback()
+		return err
+	}
+	return tx.Commit().Error
+}
+
 func ModifyAdminUserInfo(adminUserID int64, orgID int64, appID int64, name string, avatar string, newPassword string) error {
 	tx := writeUserDb.Begin()
 	editInfoErr := tx.Exec("update sgj_user_admin_role set user_name = ?, avatar = ?, mtime = ? where admin_user_id = ? and org_id = ?", name, avatar, time.Now().Unix(), adminUserID, orgID).Error
 	var roles []*models.Role
 	db := readUserDb.Model(models.Org{})
 	if isSubSuperAdmin {
-		fmt.Println("1111")
 		db = db.Where("role_name != '子管理员' AND is_system  != 1")
 	}
 	err := db.Where("org_id = ? AND status = 1", orgID).
 	}
 
 	for _, items := range viewModels {
-		ids := strings.Split(items.RoleIds, ",")
-		for _, ids := range ids {
-			id, _ := strconv.ParseInt(ids, 10, 64)
-			role, _ := GetRoleByRoleID(id)
-			if role.IsSystem == 1 && role.RoleName == "子管理员" {
-				items.IsSubAdmin = true
+		if len(items.RoleIds) > 0 {
+			ids := strings.Split(items.RoleIds, ",")
+			for _, ids := range ids {
+				id, _ := strconv.ParseInt(ids, 10, 64)
+				role, _ := GetRoleByRoleID(id)
+				if role.IsSystem == 1 && role.RoleName == "子管理员" {
+					items.IsSubAdmin = true
+				}
 			}
 		}
 	}
 func RoleAdminUserCountTwo(orgID int64, appID int64, roleID int64) (int, error) {
 	var count int
 	err := readUserDb.Model(models.App_Role{}).
-		Where("org_id = ? AND app_id = ? AND status = 1 AND find_in_set(?, role_ids)", orgID, appID, roleID).
+		Where("org_id = ? AND app_id = ? AND find_in_set(?, role_ids)", orgID, appID, roleID).
 		Count(&count).
 		Error
 	if err != nil {