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

controllers/new_mobile_api_controllers/home_api_controller.go

@@ -41,16 +41,18 @@ func (this *HomeController) GetHomeData() {
 		orgs = RemoveRepeatedOrgElement(orgs)
 
 		var isSubSuperAdmin bool = false
-
-		app_role, _ := service.GetAppRoleById(adminUserInfo.AppRole.Id)
-		role_ids := strings.Split(app_role.RoleIds, ",")
-
-		if adminUserInfo.AdminUser.Id != adminUserInfo.Org.Creator {
-			for _, item := range role_ids {
-				id, _ := strconv.ParseInt(item, 10, 64)
-				role, _ := service.GetRoleByRoleID(id)
-				if role.IsSystem == 1 && role.RoleName == "子管理员" {
-					isSubSuperAdmin = true
+		if adminUserInfo.AppRole != nil && adminUserInfo.AppRole.Id > 0 {
+			app_role, _ := service.GetAppRoleById(adminUserInfo.AppRole.Id)
+			if len(app_role.RoleIds) > 0 {
+				role_ids := strings.Split(app_role.RoleIds, ",")
+				if adminUserInfo.AdminUser.Id != adminUserInfo.Org.Creator {
+					for _, item := range role_ids {
+						id, _ := strconv.ParseInt(item, 10, 64)
+						role, _ := service.GetRoleByRoleID(id)
+						if role.IsSystem == 1 && role.RoleName == "子管理员" {
+							isSubSuperAdmin = true
+						}
+					}
 				}
 			}
 		}

controllers/new_mobile_api_controllers/new_role_api_controller.go

@@ -89,6 +89,20 @@ func (this *NewRoleApiController) GetAdminUserInfo() {
 	adminUserInfo := this.GetMobileAdminUserInfo()
 	adminUserId, _ := this.GetInt64("uid")
 
+	var isSubSuperAdmin bool = false
+	app_role, _ := service.GetAppRoleById(adminUserInfo.AppRole.Id)
+	role_ids := strings.Split(app_role.RoleIds, ",")
+
+	if adminUserInfo.AdminUser.Id != adminUserInfo.Org.Creator {
+		for _, item := range role_ids {
+			id, _ := strconv.ParseInt(item, 10, 64)
+			role, _ := service.GetRoleByRoleID(id)
+			if role.IsSystem == 1 && role.RoleName == "子管理员" {
+				isSubSuperAdmin = true
+			}
+		}
+	}
+
 	appRole, getAppRoleErr := service.GetAppRole(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserId)
 	if getAppRoleErr != nil {
 		//beego.Error("查询管理员信息时失败:", getAppRoleErr)
@@ -101,7 +115,8 @@ func (this *NewRoleApiController) GetAdminUserInfo() {
 	}
 
 	this.ServeSuccessJSON(map[string]interface{}{
-		"user_info": appRole,
+		"user_info":          appRole,
+		"is_sub_super_admin": isSubSuperAdmin,
 	})
 
 }