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

controllers/base_api_controller.go

@@ -2,8 +2,6 @@ package controllers
 
 import (
 	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
 )
 
 type BaseAPIController struct {
@@ -62,36 +60,36 @@ type BaseAuthAPIController struct {
 func (this *BaseAuthAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		var userAdmin models.AdminUser
+		//var userAdmin models.AdminUser
 		//userAdmin.Id = 400
 		//userAdmin.Mobile = "13535547901"
-
-		userAdmin.Id = 597
-		userAdmin.Mobile = "19874122664"
-		userAdmin.IsSuperAdmin = false
-		userAdmin.Status = 1
-		userAdmin.CreateTime = 1530786071
-		userAdmin.ModifyTime = 1530786071
-		var subscibe models.ServeSubscibe
-		subscibe.ID = 1
-		subscibe.OrgId = 12
-		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 adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 12
-		adminUserInfo.CurrentAppId = 18
-		adminUserInfo.AdminUser = &userAdmin
-		adminUserInfo.Subscibes = subscibes
-		this.SetSession("admin_user_info", &adminUserInfo)
-
-		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		//this.StopRun()
+		//
+		////userAdmin.Id = 597
+		////userAdmin.Mobile = "19874122664"
+		//userAdmin.IsSuperAdmin = false
+		//userAdmin.Status = 1
+		//userAdmin.CreateTime = 1530786071
+		//userAdmin.ModifyTime = 1530786071
+		//var subscibe models.ServeSubscibe
+		//subscibe.ID = 1
+		//subscibe.OrgId = 12
+		//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 adminUserInfo service.AdminUserInfo
+		//adminUserInfo.CurrentOrgId = 12
+		//adminUserInfo.CurrentAppId = 18
+		//adminUserInfo.AdminUser = &userAdmin
+		//adminUserInfo.Subscibes = subscibes
+		//this.SetSession("admin_user_info", &adminUserInfo)
+
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		this.StopRun()
 	}
 
 	//if this.Ctx.Request.Method != "GET" {
@@ -177,35 +175,35 @@ type BaseServeAPIController struct {
 func (this *BaseServeAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		var userAdmin models.AdminUser
+		//var userAdmin models.AdminUser
 		//userAdmin.Id = 400
 		//userAdmin.Mobile = "13535547901"
-		userAdmin.Id = 597
-		userAdmin.Mobile = "19874122664"
-		userAdmin.IsSuperAdmin = false
-		userAdmin.Status = 1
-		userAdmin.CreateTime = 1530786071
-		userAdmin.ModifyTime = 1530786071
-		var subscibe models.ServeSubscibe
-		subscibe.ID = 1
-		subscibe.OrgId = 12
-		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 adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 12
-		adminUserInfo.CurrentAppId = 18
-		adminUserInfo.AdminUser = &userAdmin
-		adminUserInfo.Subscibes = subscibes
-		this.SetSession("admin_user_info", &adminUserInfo)
-
-		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		//this.StopRun()
+		////userAdmin.Id = 597
+		////userAdmin.Mobile = "19874122664"
+		//userAdmin.IsSuperAdmin = false
+		//userAdmin.Status = 1
+		//userAdmin.CreateTime = 1530786071
+		//userAdmin.ModifyTime = 1530786071
+		//var subscibe models.ServeSubscibe
+		//subscibe.ID = 1
+		//subscibe.OrgId = 12
+		//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 adminUserInfo service.AdminUserInfo
+		//adminUserInfo.CurrentOrgId = 12
+		//adminUserInfo.CurrentAppId = 18
+		//adminUserInfo.AdminUser = &userAdmin
+		//adminUserInfo.Subscibes = subscibes
+		//this.SetSession("admin_user_info", &adminUserInfo)
+
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		this.StopRun()
 	}
 }
 

controllers/gobal_config_api_controller.go

@@ -17,6 +17,7 @@ import (
 	"regexp"
 	"runtime"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/astaxie/beego"
@@ -52,6 +53,9 @@ func GobalConfigRegistRouters() {
 
 	beego.Router("/api/advicetemplate/getprintinfo", &GobalConfigApiController{}, "post:GetPrintInfo")
 
+	beego.Router("/api/public/orgs", &GobalConfigApiController{}, "get:GetOrgs")
+	beego.Router("/api/org/change", &GobalConfigApiController{}, "post:ChangeOrg")
+
 }
 
 //provinces, _ := service.GetDistrictsByUpid(0)21
@@ -940,3 +944,171 @@ func (c *GobalConfigApiController) GetPrintInfo() {
 		"doctoradvice": getPrint,
 	})
 }
+
+func (c *GobalConfigApiController) GetOrgs() {
+	adminUserInfo := c.GetAdminUserInfo()
+	var orgs []*models.Org
+	adminUser, err := service.GetHomeData(adminUserInfo.AdminUser.Id)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	for _, item := range adminUser.Org {
+		orgs = append(orgs, item)
+	}
+	for _, item := range adminUser.VMApp_Role {
+		for _, subItem := range item.Org {
+			orgs = append(orgs, subItem)
+		}
+	}
+	orgs = RemoveRepeatedOrgElement(orgs)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"orgs": orgs,
+	})
+
+}
+
+func (this *GobalConfigApiController) ChangeOrg() {
+	org_id, _ := this.GetInt64("org_id")
+	adminUserInfo := this.GetAdminUserInfo()
+	tempOrg, err := service.GetOrgById(org_id)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+
+	if tempOrg == nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOrgNoExist)
+		return
+	}
+
+	mobile := adminUserInfo.AdminUser.Mobile
+	// 只取最近被创建的 admin_role
+	adminUser, getAdminErr := service.GetValidAdminUserByMobileReturnErr(mobile) //账号信息唯一值
+	if getAdminErr != nil {
+		utils.ErrorLog("获取管理员失败：%v", getAdminErr)
+		this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		this.ServeJSON()
+		return
+	} else if adminUser == nil {
+		utils.ErrorLog("查找不到 mobile = %v 的用户", mobile)
+		this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeAccountOrPasswordWrong)
+		this.ServeJSON()
+		return
+	} else {
+
+		adminUserInfo.CurrentOrgId = tempOrg.Id
+		orgApp, _ := service.GetOrgApp(tempOrg.Id, 3)
+		subscibe, _ := service.GetOrgSubscibe(tempOrg.Id)
+		adminUserInfo.CurrentAppId = orgApp.Id
+		appRole, _ := service.GetAppRole(tempOrg.Id, orgApp.Id, adminUserInfo.AdminUser.Id)
+		var FiledList []*models.FiledConfig
+		FiledList, _ = service.FindFiledByOrgId(tempOrg.Id)
+		if len(FiledList) == 0 {
+			err := service.BatchInsertFiledConfig(tempOrg.Id)
+			if err == nil {
+				FiledList, _ = service.FindFiledByOrgId(tempOrg.Id)
+
+			} else {
+				utils.ErrorLog("字段批量插入失败：%v", err)
+			}
+		}
+
+		var curAppUrlfors []string
+
+		if len(curAppUrlfors) == 0 {
+			if adminUser.Id == tempOrg.Creator {
+				urlfors_xt, _, _ := service.GetSuperAdminUsersPurviewTreeAndUrlfors(3)
+				urlfors_cdm, _, _ := service.GetSuperAdminUsersPurviewTreeAndUrlfors(4)
+				urlfors_scrm, _, _ := service.GetSuperAdminUsersPurviewTreeAndUrlfors(6)
+				urlfors_mall, _, _ := service.GetSuperAdminUsersPurviewTreeAndUrlfors(7)
+				curAppUrlfors = append(curAppUrlfors, urlfors_xt...)
+				curAppUrlfors = append(curAppUrlfors, urlfors_scrm...)
+				curAppUrlfors = append(curAppUrlfors, urlfors_cdm...)
+				curAppUrlfors = append(curAppUrlfors, urlfors_mall...)
+			} else {
+				appRole, _ := service.FindAdminUserIDA(appRole.Id)
+				role_arr := strings.Split(appRole.RoleIds, ",")
+				var ids string
+				for _, role_id := range role_arr {
+					id, _ := strconv.ParseInt(role_id, 10, 64)
+					purview_ids, _ := service.GetRolePurviewIds(id)
+					if len(ids) == 0 {
+						ids = purview_ids
+					} else {
+						ids = ids + "," + purview_ids
+					}
+				}
+
+				pruviews, _ := service.GetPurviewById(ids)
+				for _, item := range pruviews {
+					if item.Module == 3 && item.Parentid > 0 {
+						fmt.Println(item.Urlfor)
+						curAppUrlfors = append(curAppUrlfors, item.Urlfor)
+					}
+				}
+			}
+		}
+
+		userInfo := map[string]interface{}{
+			"id":         adminUser.Id,
+			"mobile":     adminUser.Mobile,
+			"user_name":  appRole.UserName,
+			"avatar":     appRole.Avatar,
+			"intro":      appRole.Intro,
+			"user_type":  appRole.UserType,
+			"user_title": appRole.UserTitle,
+		}
+		org := map[string]interface{}{
+			"id":             tempOrg.Id,
+			"org_name":       tempOrg.OrgName,
+			"org_short_name": tempOrg.OrgShortName,
+			"org_intro":      tempOrg.OrgIntroduction,
+			"org_logo":       tempOrg.OrgLogo,
+			"province":       tempOrg.Province,
+			"city":           tempOrg.City,
+			"district":       tempOrg.District,
+			"address":        tempOrg.Address,
+		}
+
+		tempInfo, _ := service.GetOrgInfoTemplate(tempOrg.Id)
+		template_info := map[string]interface{}{
+			"id":          tempInfo.ID,
+			"org_id":      tempInfo.OrgId,
+			"template_id": tempInfo.TemplateId,
+		}
+
+		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,
+			"template_info":  template_info,
+			"fileds":         FiledList,
+		})
+
+	}
+
+}
+
+func RemoveRepeatedOrgElement(orgs []*models.Org) (newOrgs []*models.Org) {
+	newOrgs = make([]*models.Org, 0)
+	for i := 0; i < len(orgs); i++ {
+		repeat := false
+		for j := i + 1; j < len(orgs); j++ {
+			if orgs[i].Id == orgs[j].Id {
+				repeat = true
+				break
+			}
+		}
+		if !repeat {
+			newOrgs = append(newOrgs, orgs[i])
+		}
+	}
+	return
+}

controllers/new_mobile_api_controllers/role.json

@@ -1,87 +1,87 @@
 {
-    "roles": [
-      {
-        "role_name": "子管理员",
-        "role_introduction": "子管理员角色具备平台全部功能的使用权限，请谨慎配置",
-        "is_super_admin": false,
-        "status": 1,
-        "is_system": 1,
-        "number": 9999,
-        "purview_ids": "71,72,70,74,75,73,127,128,48,52,110,94,111,112,113,114,115,116,117,118,119,129,84,93,121,122,124,125,120,77,78,79,80,76,156,157,158,159,155,82,83,108,149,154,190,81,101,100,102,161,160,162,163,165,170,169,171,172,173,174,177,175,178,180,179,181,186,185,187,188,189,192",
-        "func_ids": "1,2,3,4,5,6,7,8,9,10,11,12,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45"
-      },
-      {
-        "role_name": "医生",
-        "role_introduction": "医生角色能够进行建立患者档案，制定和调整患者透析治疗方案，定期评价病人的透析质量等",
-        "is_super_admin": false,
-        "status": 1,
-        "is_system": 2,
-        "number": 9998,
-        "purview_ids": "71,72,70,74,75,73,127,128,48,52,110,93,121,122,124,125,120,101,100,102,156,157,158,159,15571,72,70,74,75,73,127,128,48,52,110,93,121,122,124,125,120,101,100,102,156,157,158,159,155",
-        "func_ids": "1,2,3,4,5,6,7,8,9,10,11,12,24,25,26,27,28,29,30,31,32,33"
+  "roles": [
+    {
+      "role_name": "子管理员",
+      "role_introduction": "子管理员角色具备平台全部功能的使用权限，请谨慎配置",
+      "is_super_admin": false,
+      "status": 1,
+      "is_system": 1,
+      "number": 9999,
+      "purview_ids": "49,71,72,70,74,75,73,127,128,48,52,110,94,111,112,113,114,115,116,117,118,119,129,84,93,121,122,124,125,120,77,78,79,80,76,156,157,158,159,155,82,83,108,149,154,190,81,101,100,102,161,160,162,163,165,170,169,171,172,173,174,177,175,178,180,179,181,186,185,187,188,189,192,81,82,83,104,106,107,108,149,154,190,191",
+      "func_ids": "20001,20002,20003,20004,20005,20006,20007,20008,20009,20010,20011,20012,20024,20025,20026,20027,20028,20029,20030,20031,20032,20033,20034,20035,20036,20037,20038,20039,20040,20041,20042,20043,20044,20045"
+    },
+    {
+      "role_name": "医生",
+      "role_introduction": "医生角色能够进行建立患者档案，制定和调整患者透析治疗方案，定期评价病人的透析质量等",
+      "is_super_admin": false,
+      "status": 1,
+      "is_system": 2,
+      "number": 9998,
+      "purview_ids": "49,71,72,70,74,75,73,127,128,48,52,110,93,121,122,124,125,120,101,100,102,156,157,158,159,15571,72,70,74,75,73,127,128,48,52,110,93,121,122,124,125,120,101,100,102,156,157,158,159,155",
+      "func_ids": "20001,20002,20003,20004,20005,20006,20007,20008,20009,20010,20011,20012,20024,20025,20026,20027,20028,20029,20030,20031,20032,20033"
 
 
-      },
-      {
-        "role_name": "护士",
-        "role_introduction": "护士角色能够进行病人透析管理，以及医院的感染控制与消毒记录等",
-        "is_super_admin": false,
-        "status": 1,
-        "is_system": 3,
-        "number": 9997,
-        "purview_ids": "74,75,73,48,52,110,93,121,122,124,125,120",
-        "func_ids": "7,8,10,11,12,13,14,16,17,19,21,22,24,25,27,28"
+    },
+    {
+      "role_name": "护士",
+      "role_introduction": "护士角色能够进行病人透析管理，以及医院的感染控制与消毒记录等",
+      "is_super_admin": false,
+      "status": 1,
+      "is_system": 3,
+      "number": 9997,
+      "purview_ids": "49,74,75,73,48,52,110,93,121,122,124,125,120",
+      "func_ids": "20007,20008,20010,20011,20012,20013,20014,20016,20017,20019,20021,20022,20024,20025,20027,20028"
 
 
 
-      },
-      {
-        "role_name": "库存",
-        "role_introduction": "库存角色负责透析耗材的日常管理，对耗材的入库、出库、退库的登记操作",
-        "is_super_admin": false,
-        "status": 1,
-        "is_system": 0,
-        "number": 9996,
-        "purview_ids": "94,111,112,113,114,115,116,117,118,119,129,84",
-        "func_ids": ""
+    },
+    {
+      "role_name": "库存",
+      "role_introduction": "库存角色负责透析耗材的日常管理，对耗材的入库、出库、退库的登记操作",
+      "is_super_admin": false,
+      "status": 1,
+      "is_system": 0,
+      "number": 9996,
+      "purview_ids": "94,111,112,113,114,115,116,117,118,119,129,84",
+      "func_ids": ""
 
 
 
-      },{
-        "role_name": "运营",
-        "role_introduction": "运营角色能够在SCRM中管理微网站、使用营销工具、做会员管理和分销商品经营的操作",
-        "is_super_admin": false,
-        "status": 1,
-        "is_system": 0,
-        "number": 9995,
-        "purview_ids": "161,160,162,163,165,170,169,171,172,173,174,177,175,178,180,179,181,186,185,187,188,189,192",
-        "func_ids": ""
+    },{
+      "role_name": "运营",
+      "role_introduction": "运营角色能够在SCRM中管理微网站、使用营销工具、做会员管理和分销商品经营的操作",
+      "is_super_admin": false,
+      "status": 1,
+      "is_system": 0,
+      "number": 9995,
+      "purview_ids": "161,160,162,163,165,170,169,171,172,173,174,177,175,178,180,179,181,186,185,187,188,189,192",
+      "func_ids": ""
 
 
 
-      },{
-        "role_name": "技师",
-        "role_introduction": "技师角色能够进行设备的管理，日常维护维修记录等",
-        "is_super_admin": false,
-        "status": 1,
-        "is_system": 0,
-        "number": 9994,
-        "purview_ids": "77,78,79,80,76",
-        "func_ids": ""
+    },{
+      "role_name": "技师",
+      "role_introduction": "技师角色能够进行设备的管理，日常维护维修记录等",
+      "is_super_admin": false,
+      "status": 1,
+      "is_system": 0,
+      "number": 9994,
+      "purview_ids": "77,78,79,80,76,191",
+      "func_ids": ""
 
 
-      },
-      {
-        "role_name": "院长",
-        "role_introduction": "院长角色了解血透患者血液透析质量和相关的大数据，以及掌握透析中心整体运营情况",
-        "is_super_admin": false,
-        "status": 1,
-        "is_system": 0,
-        "number": 9993,
-        "purview_ids": "",
-        "func_ids": ""
+    },
+    {
+      "role_name": "院长",
+      "role_introduction": "院长角色了解血透患者血液透析质量和相关的大数据，以及掌握透析中心整体运营情况",
+      "is_super_admin": false,
+      "status": 1,
+      "is_system": 0,
+      "number": 9993,
+      "purview_ids": "",
+      "func_ids": ""
 
 
-      }
-    ]
+    }
+  ]
 }

controllers/role_controller.go

@@ -588,6 +588,7 @@ func (this *RoleAPIController) EditAdminInitData() {
 		"roles":           roles,
 		"qntoken":         qntoken,
 		"isSubSuperAdmin": isSubSuperAdmin,
+		"org":             org,
 	})
 }
 

routers/router.go

@@ -12,7 +12,7 @@ import (
 func init() {
 	beego.InsertFilter("*", beego.BeforeRouter, cors.Allow(&cors.Options{
 		// AllowAllOrigins:  true,
-		AllowOrigins: []string{"https://xt.kuyicloud.com", "http://localhost:9528", "http://localhost:9531", "http://xt.test.shengws.com", "http://new_mobile.test.sgjyun.com", "https://xt.test.shengws.com", "http://xt.test.sgjyun.com", "https://xt.test.sgjyun.com", "http://localhost:8081", "http://localhost:8082", "https://pad.kuyicloud.com", "http://pad.kuyicloud.com", "http://pad.test.sgjyun.com", "https://pad.test.sgjyun.com", "http://admin.xt.test.sgjyun.com", "http://admin.xt.kuyicloud.com", "http://mobile.sgjyun.com", "http://mobile.kuyicloud.com"},
+		AllowOrigins: []string{"https://xt.kuyicloud.com", "http://localhost:9528", "http://localhost:9531", "http://xt.test.shengws.com", "http://new_mobile.test.sgjyun.com", "https://xt.test.shengws.com", "http://xt.test.sgjyun.com:9528", "https://xt.test.sgjyun.com", "http://localhost:8081", "http://localhost:8082", "https://pad.kuyicloud.com", "http://pad.kuyicloud.com", "http://pad.test.sgjyun.com", "https://pad.test.sgjyun.com", "http://admin.xt.test.sgjyun.com", "http://admin.xt.kuyicloud.com", "http://mobile.sgjyun.com", "http://mobile.kuyicloud.com"},
 		//AllowOrigins:     []string{"https://xt.kuyicloud.com", "http://localhost:9528", "http://xt.test.shengws.com","https://xt.test.shengws.com", "http://xt.test.sgjyun.com","https://xt.test.sgjyun.com", "http://localhost:8081", "http://localhost:8082", "https://pad.kuyicloud.com", "http://pad.kuyicloud.com", "http://pad.test.sgjyun.com","https://pad.test.sgjyun.com", "http://admin.xt.test.sgjyun.com", "http://admin.xt.kuyicloud.com","http://mobile.sgjyun.com","http://mobile.kuyicloud.com"},
 		AllowMethods:     []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
 		AllowHeaders:     []string{"Origin", "Authorization", "Access-Control-Allow-Origin", "Access-Control-Allow-Headers", "Content-Type", "X-XSRF-TOKEN", "Permission"},

service/orginfo_service.go

@@ -3,6 +3,7 @@ package service
 import (
 	"XT_New/models"
 	"github.com/jinzhu/gorm"
+	"strconv"
 	"time"
 )
 
@@ -142,11 +143,13 @@ func createOrgApp(tx *gorm.DB, superAdminRole *models.Role, userName string, app
 		}
 	}
 
+	//string := strconv.FormatInt(int64,10        /)
 	app_role := models.App_Role{
 		AdminUserId: superAdminRole.Creator,
 		OrgId:       superAdminRole.OrgId,
 		AppId:       app_id,
 		RoleId:      superAdminRole.Id,
+		RoleIds:     strconv.FormatInt(superAdminRole.Id, 10),
 		Avatar:      "",
 		UserName:    userName,
 		Intro:       "",

service/role_service.go

@@ -41,14 +41,14 @@ func GetAppRole(orgID int64, appID int64, adminUserID int64) (*models.App_Role,
 			return nil, err
 		}
 	}
-
-	role_ids := strings.Split(appRole.RoleIds, ",")
-
-	for _, item := range role_ids {
-		id, _ := strconv.ParseInt(item, 10, 64)
-		role, _ := GetRoleByRoleID(id)
-		if role.IsSystem == 1 && role.RoleName == "子管理员" {
-			appRole.IsSubSuperAdmin = true
+	if len(appRole.RoleIds) > 0 {
+		role_ids := strings.Split(appRole.RoleIds, ",")
+		for _, item := range role_ids {
+			id, _ := strconv.ParseInt(item, 10, 64)
+			role, _ := GetRoleByRoleID(id)
+			if role.IsSystem == 1 && role.RoleName == "子管理员" {
+				appRole.IsSubSuperAdmin = true
+			}
 		}
 	}
 
@@ -136,7 +136,7 @@ func GetAdminUsersAndLoginInfo(orgID int64, appID int64, page int, count int) ([
 		page = 1
 	}
 	var viewModels []*AdminUserManageViewModel = make([]*AdminUserManageViewModel, 0)
-	rows, err := readUserDb.Raw("SELECT u_a_r.admin_user_id, u_a_r.user_name, u_a_r.user_title, u_l.ip, u_l.ctime, u_a_r.status,u_a_r.avatar,u_a_r.role_ids FROM sgj_user_admin_role AS u_a_r  LEFT JOIN (SELECT * FROM (SELECT admin_user_id, org_id, app_id, ip, ctime FROM sgj_user_admin_login_log WHERE org_id = ? AND app_id = ?  ORDER BY ctime DESC) AS t GROUP BY admin_user_id) AS u_l ON u_a_r.org_id = u_l.org_id AND u_a_r.app_id = u_l.app_id AND u_a_r.admin_user_id = u_l.admin_user_id WHERE u_a_r.org_id = ? AND u_a_r.app_id = ? AND user_type != 1 GROUP BY u_a_r.admin_user_id LIMIT ? OFFSET ?;", orgID, appID, orgID, appID, count, (page-1)*count).Rows()
+	rows, err := readUserDb.Raw("SELECT u_a_r.admin_user_id, u_a_r.user_name, u_a_r.user_title, u_l.ip, u_l.ctime, u_a_r.status,u_a_r.avatar,u_a_r.role_ids FROM sgj_user_admin_role AS u_a_r  LEFT JOIN (SELECT * FROM (SELECT admin_user_id, org_id, app_id, ip, ctime FROM sgj_user_admin_login_log WHERE org_id = ? AND app_id = ?  ORDER BY ctime DESC) AS t GROUP BY admin_user_id) AS u_l ON u_a_r.org_id = u_l.org_id AND u_a_r.app_id = u_l.app_id AND u_a_r.admin_user_id = u_l.admin_user_id WHERE u_a_r.org_id = ? AND u_a_r.app_id = ? GROUP BY u_a_r.admin_user_id LIMIT ? OFFSET ?;", orgID, appID, orgID, appID, count, (page-1)*count).Rows()
 	defer rows.Close()
 	if err != nil {
 		if err == gorm.ErrRecordNotFound {
@@ -160,18 +160,20 @@ func GetAdminUsersAndLoginInfo(orgID int64, appID int64, page int, count int) ([
 	}
 
 	for _, item := range viewModels {
-		ids := strings.Split(item.RoleIds, ",")
-		for _, id := range ids {
-			id, _ := strconv.ParseInt(id, 10, 64)
-			role, _ := GetRoleByRoleID(id)
-			if role.IsSystem == 1 && role.RoleName == "子管理员" {
-				item.IsSubSuperAdmin = true
-			}
+		if len(item.RoleIds) > 0 {
+			ids := strings.Split(item.RoleIds, ",")
+			for _, id := range ids {
+				id, _ := strconv.ParseInt(id, 10, 64)
+				role, _ := GetRoleByRoleID(id)
+				if role.IsSystem == 1 && role.RoleName == "子管理员" {
+					item.IsSubSuperAdmin = true
+				}
 
-			if len(item.RoleName) == 0 {
-				item.RoleName = role.RoleName
-			} else {
-				item.RoleName = item.RoleName + "," + role.RoleName
+				if len(item.RoleName) == 0 {
+					item.RoleName = role.RoleName
+				} else {
+					item.RoleName = item.RoleName + "," + role.RoleName
+				}
 			}
 		}