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

controllers/base_api_controller.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"XT_New/enums"
+	//"XT_New/models"
 	"XT_New/service"
 	"fmt"
 	"strconv"

controllers/dialysis_api_controller.go

@@ -3084,10 +3084,17 @@ func (c *DialysisApiController) PostAssessmentAfterDislysis() {
 			assessment.AssessmentDoctor = adminUserInfo.AdminUser.Id
 			assessment.AssessmentTime = time.Now().Unix()
 
-		} else {
+		}
+		if assessment.Creater == 0 {
 			assessment.Modifier = adminUserInfo.AdminUser.Id
 			assessment.Creater = adminUserInfo.AdminUser.Id
+
+		} else {
+			assessment.Modifier = adminUserInfo.AdminUser.Id
+			assessment.Creater = assessment.Creater
+
 		}
+
 		assessment.UpdatedTime = time.Now().Unix()
 		err = service.UpdateAssessmentAfterDislysisRecord(&assessment)
 	} else {
@@ -3095,10 +3102,8 @@ func (c *DialysisApiController) PostAssessmentAfterDislysis() {
 			assessment.AssessmentDoctor = adminUserInfo.AdminUser.Id
 			assessment.AssessmentTime = time.Now().Unix()
 
-		} else {
-			assessment.Creater = adminUserInfo.AdminUser.Id
-
 		}
+		assessment.Creater = adminUserInfo.AdminUser.Id
 		assessment.CreatedTime = time.Now().Unix()
 		assessment.UpdatedTime = time.Now().Unix()
 		assessment.UserOrgId = adminUserInfo.CurrentOrgId
@@ -3246,10 +3251,10 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		if appRole.UserType == 2 || appRole.UserType == 1 {
 			assessmentBeforeDislysis.AssessmentDoctor = adminUserInfo.AdminUser.Id
 			assessmentBeforeDislysis.AssessmentTime = time.Now().Unix()
-		} else {
-			assessmentBeforeDislysis.Creater = adminUserInfo.AdminUser.Id
 		}
 
+		assessmentBeforeDislysis.Creater = adminUserInfo.AdminUser.Id
+
 		err := service.AddSigleAssessmentBeforeDislysisRecord(&assessmentBeforeDislysis)
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
@@ -3277,10 +3282,15 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		if appRole.UserType == 2 || appRole.UserType == 1 {
 			assessmentBeforeDislysis.AssessmentDoctor = adminUserInfo.AdminUser.Id
 			assessmentBeforeDislysis.AssessmentTime = time.Now().Unix()
-		} else {
+		}
+		if assessmentBeforeDislysis.Creater == 0 {
 			assessmentBeforeDislysis.Modifier = adminUserInfo.AdminUser.Id
 			assessmentBeforeDislysis.Creater = adminUserInfo.AdminUser.Id
+		} else {
+			assessmentBeforeDislysis.Modifier = adminUserInfo.AdminUser.Id
+			assessmentBeforeDislysis.Creater = evaluation.Creater
 		}
+
 		assessmentBeforeDislysis.UpdatedTime = time.Now().Unix()
 		assessmentBeforeDislysis.ID = evaluation.ID
 		assessmentBeforeDislysis.CreatedTime = evaluation.CreatedTime

controllers/new_mobile_api_controllers/home_api_controller.go

@@ -48,9 +48,13 @@ func (this *HomeController) GetHomeData() {
 				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 id > 0 {
+							role, _ := service.GetRoleByRoleID(id)
+							if role != nil {
+								if role.IsSystem == 1 && role.RoleName == "子管理员" {
+									isSubSuperAdmin = true
+								}
+							}
 						}
 					}
 				}

controllers/new_mobile_api_controllers/new_role_api_controller.go

@@ -20,12 +20,19 @@ func (this *NewRoleApiController) GetAllOrgUser() {
 	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 len(role_ids) > 0 {
+		if adminUserInfo.AdminUser.Id != adminUserInfo.Org.Creator {
+			for _, item := range role_ids {
+				id, _ := strconv.ParseInt(item, 10, 64)
+				if id != 0 {
+					role, _ := service.GetRoleByRoleID(id)
+					if role != nil {
+						if role.IsSystem == 1 && role.RoleName == "子管理员" {
+							isSubSuperAdmin = true
+						}
+					}
+				}
+
 			}
 		}
 	}
@@ -88,17 +95,22 @@ func (this *NewRoleApiController) GetEditAdminInitData() {
 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
+	if len(role_ids) > 0 {
+		if adminUserInfo.AdminUser.Id != adminUserInfo.Org.Creator {
+			for _, item := range role_ids {
+				id, _ := strconv.ParseInt(item, 10, 64)
+				if id != 0 {
+					role, _ := service.GetRoleByRoleID(id)
+					if role != nil {
+
+						if role.IsSystem == 1 && role.RoleName == "子管理员" {
+							isSubSuperAdmin = true
+						}
+					}
+				}
 			}
 		}
 	}
@@ -115,8 +127,8 @@ func (this *NewRoleApiController) GetAdminUserInfo() {
 	}
 
 	this.ServeSuccessJSON(map[string]interface{}{
-		"user_info":          appRole,
-		"is_sub_super_admin": isSubSuperAdmin,
+		"user_info":       appRole,
+		"isSubSuperAdmin": isSubSuperAdmin,
 	})
 
 }
@@ -231,13 +243,19 @@ func (this *NewRoleApiController) GetAllOrgRole() {
 
 	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 len(role_ids) > 0 {
+
+		if adminUserInfo.AdminUser.Id != adminUserInfo.Org.Creator {
+			for _, item := range role_ids {
+				id, _ := strconv.ParseInt(item, 10, 64)
+				if id != 0 {
+					role, _ := service.GetRoleByRoleID(id)
+					if role != nil {
+						if role.IsSystem == 1 && role.RoleName == "子管理员" {
+							isSubSuperAdmin = true
+						}
+					}
+				}
 			}
 		}
 	}

controllers/new_mobile_api_controllers/role.json

@@ -78,7 +78,7 @@
       "status": 1,
       "is_system": 0,
       "number": 9993,
-      "purview_ids": "",
+      "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",
       "func_ids": ""
 
 

controllers/public_api_controller.go

@@ -163,281 +163,276 @@ func (this *PublicApiController) GetJson() {
 }
 
 func (c *PublicApiController) HandleData() {
-	//org_app, _ := service.GetAllAppOrg()
+	org_app, _ := service.GetAllAppOrg()
 	org_role, _ := service.GetAllRole()
 
 	var org_ids []int64
 
-	//for _, apps := range org_app {
-	//	xt_org_app, _ := service.GetAppByType(int64(apps.OrgId), 3)
-	//	scrm_org_app, _ := service.GetAppByType(int64(apps.OrgId), 1)
-	//	cdm_org_app, _ := service.GetAppByType(int64(apps.OrgId), 4)
-	//	mall_org_app, _ := service.GetAppByType(int64(apps.OrgId), 5)
-	//	org_app_6, _ := service.GetAppByType(int64(apps.OrgId), 6)
-	//	org_app_7, _ := service.GetAppByType(int64(apps.OrgId), 7)
-	//	org_app_8, _ := service.GetAppByType(int64(apps.OrgId), 8)
-	//	org_app_9, _ := service.GetAppByType(int64(apps.OrgId), 9)
-	//	org_app_10, _ := service.GetAppByType(int64(apps.OrgId), 10)
-	//	org_app_11, _ := service.GetAppByType(int64(apps.OrgId), 11)
-	//	org_app_12, _ := service.GetAppByType(int64(apps.OrgId), 12)
-	//	org_app_13, _ := service.GetAppByType(int64(apps.OrgId), 13)
-	//	org_app_14, _ := service.GetAppByType(int64(apps.OrgId), 14)
-	//	org_app_15, _ := service.GetAppByType(int64(apps.OrgId), 15)
-	//
-	//	var xt_temp_org_app *models.OrgApp
-	//	var mall_temp_org_app *models.OrgApp
-	//
-	//
-	//	if xt_org_app == nil || xt_org_app.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
-	//
-	//		app, _ := service.GetOrgApp(0,3)
-	//		org, _ := service.GetOrgById(int64(apps.OrgId))
-	//
-	//		app.Id = 0
-	//		app.OrgId = apps.OrgId
-	//		app.Creator = int(org.Creator)
-	//		app.Number  = 0
-	//		app.Status = 1
-	//		app.ModifyTime = time.Now().Unix()
-	//		app.CreateTime = time.Now().Unix()
-	//		service.CreateOrgApp(app)
-	//		xt_temp_org_app = app
-	//	}else{
-	//
-	//		xt_temp_org_app = xt_org_app
-	//
-	//	}
-	//
-	//	if scrm_org_app == nil || scrm_org_app.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
-	//
-	//		app, _ := service.GetOrgApp(0,1)
-	//		//org, _ := service.GetOrgById(int64(12))
-	//		org, _ := service.GetOrgById(int64(apps.OrgId))
-	//
-	//		app.OrgId = apps.OrgId
-	//		app.Id = 0
-	//
-	//		app.Creator = int(org.Creator)
-	//		app.Number  = 0
-	//		app.Status = 1
-	//		app.ModifyTime = time.Now().Unix()
-	//		app.CreateTime = time.Now().Unix()
-	//		service.CreateOrgApp(app)
-	//
-	//	}
-	//
-	//	if cdm_org_app == nil || cdm_org_app.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
-	//		app, _ := service.GetOrgApp(0,4)
-	//		//org, _ := service.GetOrgById(int64(12))
-	//		org, _ := service.GetOrgById(int64(apps.OrgId))
-	//
-	//		app.OrgId = apps.OrgId
-	//		app.Creator = int(org.Creator)
-	//		app.Number  = 0
-	//		app.Id = 0
-	//
-	//		app.Status = 1
-	//		app.ModifyTime = time.Now().Unix()
-	//		app.CreateTime = time.Now().Unix()
-	//		service.CreateOrgApp(app)
-	//	}
-	//
-	//	if mall_org_app == nil || mall_org_app.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
-	//		app, _ := service.GetOrgApp(0,5)
-	//		//org, _ := service.GetOrgById(int64(12))
-	//		org, _ := service.GetOrgById(int64(apps.OrgId))
-	//
-	//		app.OrgId = apps.OrgId
-	//		app.Creator = int(org.Creator)
-	//		app.Number  = 0
-	//		app.Id = 0
-	//
-	//		app.Status = 1
-	//		app.ModifyTime = time.Now().Unix()
-	//		app.CreateTime = time.Now().Unix()
-	//		service.CreateOrgApp(app)
-	//		mall_temp_org_app = app
-	//	}else{
-	//		mall_temp_org_app = mall_org_app
-	//	}
-	//
-	//
-	//
-	//	if org_app_6 == nil || org_app_6.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
-	//		app, _ := service.GetOrgApp(0,6)
-	//		//org, _ := service.GetOrgById(int64(12))
-	//		org, _ := service.GetOrgById(int64(apps.OrgId))
-	//
-	//		app.OrgId = apps.OrgId
-	//		app.Creator = int(org.Creator)
-	//		app.Number  = 0
-	//		app.Id = 0
-	//
-	//		app.Status = 1
-	//		app.ModifyTime = time.Now().Unix()
-	//		app.CreateTime = time.Now().Unix()
-	//		app.Pid  = xt_temp_org_app.Id
-	//		service.CreateOrgApp(app)
-	//
-	//
-	//	}
-	//	if org_app_7 == nil || org_app_7.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
-	//		app, _ := service.GetOrgApp(0,7)
-	//		//org, _ := service.GetOrgById(int64(12))
-	//		org, _ := service.GetOrgById(int64(apps.OrgId))
-	//
-	//		app.OrgId = apps.OrgId
-	//		app.Creator = int(org.Creator)
-	//		app.Number  = 0
-	//		app.Status = 1
-	//		app.Id = 0
-	//
-	//		app.ModifyTime = time.Now().Unix()
-	//		app.CreateTime = time.Now().Unix()
-	//		app.Pid  = xt_temp_org_app.Id
-	//
-	//		service.CreateOrgApp(app)
-	//	}
-	//	if org_app_8 == nil || org_app_8.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
-	//		app, _ := service.GetOrgApp(0,8)
-	//		//org, _ := service.GetOrgById(int64(12))
-	//		org, _ := service.GetOrgById(int64(apps.OrgId))
-	//
-	//		app.OrgId = apps.OrgId
-	//		app.Creator = int(org.Creator)
-	//		app.Number  = 0
-	//		app.Id = 0
-	//
-	//		app.Pid  = mall_temp_org_app.Id
-	//
-	//		app.Status = 1
-	//		app.ModifyTime = time.Now().Unix()
-	//		app.CreateTime = time.Now().Unix()
-	//		service.CreateOrgApp(app)
-	//	}
-	//	if org_app_9 == nil || org_app_9.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
-	//		app, _ := service.GetOrgApp(0,9)
-	//		//org, _ := service.GetOrgById(int64(12))
-	//		org, _ := service.GetOrgById(int64(apps.OrgId))
-	//
-	//		app.OrgId = apps.OrgId
-	//		app.Pid  = xt_temp_org_app.Id
-	//
-	//		app.Creator = int(org.Creator)
-	//		app.Number  = 0
-	//		app.Id = 0
-	//
-	//		app.Status = 1
-	//		app.ModifyTime = time.Now().Unix()
-	//		app.CreateTime = time.Now().Unix()
-	//		service.CreateOrgApp(app)
-	//
-	//	}
-	//	if org_app_10 == nil || org_app_10.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
-	//		app, _ := service.GetOrgApp(0,10)
-	//		//org, _ := service.GetOrgById(int64(12))
-	//		org, _ := service.GetOrgById(int64(apps.OrgId))
-	//
-	//		app.OrgId = apps.OrgId
-	//		app.Creator = int(org.Creator)
-	//		app.Pid  = xt_temp_org_app.Id
-	//
-	//		app.Number  = 0
-	//		app.Id = 0
-	//
-	//		app.Status = 1
-	//		app.ModifyTime = time.Now().Unix()
-	//		app.CreateTime = time.Now().Unix()
-	//		service.CreateOrgApp(app)
-	//	}
-	//	if org_app_11 == nil || org_app_11.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
-	//		app, _ := service.GetOrgApp(0,11)
-	//		//org, _ := service.GetOrgById(int64(12))
-	//		org, _ := service.GetOrgById(int64(apps.OrgId))
-	//
-	//		app.OrgId = app.OrgId
-	//		app.Creator = int(org.Creator)
-	//		app.Pid  = xt_temp_org_app.Id
-	//		app.Id = 0
-	//
-	//		app.Number  = 0
-	//		app.Status = 1
-	//		app.ModifyTime = time.Now().Unix()
-	//		app.CreateTime = time.Now().Unix()
-	//		service.CreateOrgApp(app)
-	//	}
-	//	if org_app_12 == nil || org_app_12.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
-	//		app, _ := service.GetOrgApp(0,12)
-	//		//org, _ := service.GetOrgById(int64(12))
-	//		org, _ := service.GetOrgById(int64(apps.OrgId))
-	//
-	//		app.OrgId = apps.OrgId
-	//		app.Creator = int(org.Creator)
-	//		app.Pid  = xt_temp_org_app.Id
-	//		app.Number  = 0
-	//		app.Status = 1
-	//		app.Id = 0
-	//
-	//		app.ModifyTime = time.Now().Unix()
-	//		app.CreateTime = time.Now().Unix()
-	//		service.CreateOrgApp(app)
-	//	}
-	//	if org_app_13 == nil || org_app_13.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
-	//		app, _ := service.GetOrgApp(0,13)
-	//		//org, _ := service.GetOrgById(int64(12))
-	//		org, _ := service.GetOrgById(int64(apps.OrgId))
-	//
-	//		app.OrgId = apps.OrgId
-	//		app.Creator = int(org.Creator)
-	//		app.Pid  = xt_temp_org_app.Id
-	//		app.Number  = 0
-	//		app.Id = 0
-	//
-	//		app.Status = 1
-	//		app.ModifyTime = time.Now().Unix()
-	//		app.CreateTime = time.Now().Unix()
-	//		service.CreateOrgApp(app)
-	//	}
-	//	if org_app_14 == nil || org_app_14.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
-	//		app, _ := service.GetOrgApp(0,14)
-	//		//org, _ := service.GetOrgById(int64(12))
-	//		org, _ := service.GetOrgById(int64(apps.OrgId))
-	//
-	//		app.OrgId = apps.OrgId
-	//		app.Creator = int(org.Creator)
-	//		app.Pid  = xt_temp_org_app.Id
-	//		app.Id = 0
-	//		app.Number  = 0
-	//		app.Status = 1
-	//		app.ModifyTime = time.Now().Unix()
-	//		app.CreateTime = time.Now().Unix()
-	//		service.CreateOrgApp(app)
-	//	}
-	//
-	//	if org_app_15 == nil || org_app_15.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
-	//		app, _ := service.GetOrgApp(0,15)
-	//		//org, _ := service.GetOrgById(int64(12))
-	//		org, _ := service.GetOrgById(int64(apps.OrgId))
-	//
-	//		app.OrgId = apps.OrgId
-	//		app.Creator = int(org.Creator)
-	//		app.Pid  = xt_temp_org_app.Id
-	//		app.Number  = 0
-	//		app.Status = 1
-	//		app.Id = 0
-	//		app.ModifyTime = time.Now().Unix()
-	//		app.CreateTime = time.Now().Unix()
-	//		service.CreateOrgApp(app)
-	//	}
-	//}
-	//
+	for _, apps := range org_app {
+		xt_org_app, _ := service.GetAppByType(int64(apps.OrgId), 3)
+		scrm_org_app, _ := service.GetAppByType(int64(apps.OrgId), 1)
+		cdm_org_app, _ := service.GetAppByType(int64(apps.OrgId), 4)
+		mall_org_app, _ := service.GetAppByType(int64(apps.OrgId), 5)
+		org_app_6, _ := service.GetAppByType(int64(apps.OrgId), 6)
+		org_app_7, _ := service.GetAppByType(int64(apps.OrgId), 7)
+		org_app_8, _ := service.GetAppByType(int64(apps.OrgId), 8)
+		org_app_9, _ := service.GetAppByType(int64(apps.OrgId), 9)
+		org_app_10, _ := service.GetAppByType(int64(apps.OrgId), 10)
+		org_app_11, _ := service.GetAppByType(int64(apps.OrgId), 11)
+		org_app_12, _ := service.GetAppByType(int64(apps.OrgId), 12)
+		org_app_13, _ := service.GetAppByType(int64(apps.OrgId), 13)
+		org_app_14, _ := service.GetAppByType(int64(apps.OrgId), 14)
+		org_app_15, _ := service.GetAppByType(int64(apps.OrgId), 15)
+
+		var xt_temp_org_app *models.OrgApp
+		var mall_temp_org_app *models.OrgApp
+
+		if xt_org_app == nil || xt_org_app.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
+
+			app, _ := service.GetOrgApp(0, 3)
+			org, _ := service.GetOrgById(int64(apps.OrgId))
+
+			app.Id = 0
+			app.OrgId = apps.OrgId
+			app.Creator = int(org.Creator)
+			app.Number = 0
+			app.Status = 1
+			app.ModifyTime = time.Now().Unix()
+			app.CreateTime = time.Now().Unix()
+			service.CreateOrgApp(app)
+			xt_temp_org_app = app
+		} else {
+
+			xt_temp_org_app = xt_org_app
+
+		}
+
+		if scrm_org_app == nil || scrm_org_app.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
+
+			app, _ := service.GetOrgApp(0, 1)
+			//org, _ := service.GetOrgById(int64(12))
+			org, _ := service.GetOrgById(int64(apps.OrgId))
+
+			app.OrgId = apps.OrgId
+			app.Id = 0
+
+			app.Creator = int(org.Creator)
+			app.Number = 0
+			app.Status = 1
+			app.ModifyTime = time.Now().Unix()
+			app.CreateTime = time.Now().Unix()
+			service.CreateOrgApp(app)
+
+		}
+
+		if cdm_org_app == nil || cdm_org_app.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
+			app, _ := service.GetOrgApp(0, 4)
+			//org, _ := service.GetOrgById(int64(12))
+			org, _ := service.GetOrgById(int64(apps.OrgId))
+
+			app.OrgId = apps.OrgId
+			app.Creator = int(org.Creator)
+			app.Number = 0
+			app.Id = 0
+
+			app.Status = 1
+			app.ModifyTime = time.Now().Unix()
+			app.CreateTime = time.Now().Unix()
+			service.CreateOrgApp(app)
+		}
+
+		if mall_org_app == nil || mall_org_app.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
+			app, _ := service.GetOrgApp(0, 5)
+			//org, _ := service.GetOrgById(int64(12))
+			org, _ := service.GetOrgById(int64(apps.OrgId))
+
+			app.OrgId = apps.OrgId
+			app.Creator = int(org.Creator)
+			app.Number = 0
+			app.Id = 0
+
+			app.Status = 1
+			app.ModifyTime = time.Now().Unix()
+			app.CreateTime = time.Now().Unix()
+			service.CreateOrgApp(app)
+			mall_temp_org_app = app
+		} else {
+			mall_temp_org_app = mall_org_app
+		}
+
+		if org_app_6 == nil || org_app_6.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
+			app, _ := service.GetOrgApp(0, 6)
+			//org, _ := service.GetOrgById(int64(12))
+			org, _ := service.GetOrgById(int64(apps.OrgId))
+
+			app.OrgId = apps.OrgId
+			app.Creator = int(org.Creator)
+			app.Number = 1
+			app.Id = 0
+
+			app.Status = 1
+			app.ModifyTime = time.Now().Unix()
+			app.CreateTime = time.Now().Unix()
+			app.Pid = xt_temp_org_app.Id
+			service.CreateOrgApp(app)
+
+		}
+		if org_app_7 == nil || org_app_7.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
+			app, _ := service.GetOrgApp(0, 7)
+			//org, _ := service.GetOrgById(int64(12))
+			org, _ := service.GetOrgById(int64(apps.OrgId))
+
+			app.OrgId = apps.OrgId
+			app.Creator = int(org.Creator)
+			app.Number = 0
+			app.Status = 2
+			app.Id = 0
+
+			app.ModifyTime = time.Now().Unix()
+			app.CreateTime = time.Now().Unix()
+			app.Pid = xt_temp_org_app.Id
+
+			service.CreateOrgApp(app)
+		}
+		if org_app_8 == nil || org_app_8.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
+			app, _ := service.GetOrgApp(0, 8)
+			//org, _ := service.GetOrgById(int64(12))
+			org, _ := service.GetOrgById(int64(apps.OrgId))
+
+			app.OrgId = apps.OrgId
+			app.Creator = int(org.Creator)
+			app.Number = 3
+			app.Id = 0
+
+			app.Pid = mall_temp_org_app.Id
+
+			app.Status = 1
+			app.ModifyTime = time.Now().Unix()
+			app.CreateTime = time.Now().Unix()
+			service.CreateOrgApp(app)
+		}
+		if org_app_9 == nil || org_app_9.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
+			app, _ := service.GetOrgApp(0, 9)
+			//org, _ := service.GetOrgById(int64(12))
+			org, _ := service.GetOrgById(int64(apps.OrgId))
+
+			app.OrgId = apps.OrgId
+			app.Pid = xt_temp_org_app.Id
+
+			app.Creator = int(org.Creator)
+			app.Number = 4
+			app.Id = 0
+
+			app.Status = 1
+			app.ModifyTime = time.Now().Unix()
+			app.CreateTime = time.Now().Unix()
+			service.CreateOrgApp(app)
+
+		}
+		if org_app_10 == nil || org_app_10.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
+			app, _ := service.GetOrgApp(0, 10)
+			//org, _ := service.GetOrgById(int64(12))
+			org, _ := service.GetOrgById(int64(apps.OrgId))
+
+			app.OrgId = apps.OrgId
+			app.Creator = int(org.Creator)
+			app.Pid = xt_temp_org_app.Id
+
+			app.Number = 5
+			app.Id = 0
+
+			app.Status = 1
+			app.ModifyTime = time.Now().Unix()
+			app.CreateTime = time.Now().Unix()
+			service.CreateOrgApp(app)
+		}
+		if org_app_11 == nil || org_app_11.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
+			app, _ := service.GetOrgApp(0, 11)
+			//org, _ := service.GetOrgById(int64(12))
+			org, _ := service.GetOrgById(int64(apps.OrgId))
+
+			app.OrgId = app.OrgId
+			app.Creator = int(org.Creator)
+			app.Pid = xt_temp_org_app.Id
+			app.Id = 0
+
+			app.Number = 6
+			app.Status = 1
+			app.ModifyTime = time.Now().Unix()
+			app.CreateTime = time.Now().Unix()
+			service.CreateOrgApp(app)
+		}
+		if org_app_12 == nil || org_app_12.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
+			app, _ := service.GetOrgApp(0, 12)
+			//org, _ := service.GetOrgById(int64(12))
+			org, _ := service.GetOrgById(int64(apps.OrgId))
+
+			app.OrgId = apps.OrgId
+			app.Creator = int(org.Creator)
+			app.Pid = xt_temp_org_app.Id
+			app.Number = 7
+			app.Status = 1
+			app.Id = 0
+
+			app.ModifyTime = time.Now().Unix()
+			app.CreateTime = time.Now().Unix()
+			service.CreateOrgApp(app)
+		}
+		if org_app_13 == nil || org_app_13.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
+			app, _ := service.GetOrgApp(0, 13)
+			//org, _ := service.GetOrgById(int64(12))
+			org, _ := service.GetOrgById(int64(apps.OrgId))
+
+			app.OrgId = apps.OrgId
+			app.Creator = int(org.Creator)
+			app.Pid = xt_temp_org_app.Id
+			app.Number = 8
+			app.Id = 0
+			app.Status = 1
+			app.ModifyTime = time.Now().Unix()
+			app.CreateTime = time.Now().Unix()
+			service.CreateOrgApp(app)
+		}
+		if org_app_14 == nil || org_app_14.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
+			app, _ := service.GetOrgApp(0, 14)
+			//org, _ := service.GetOrgById(int64(12))
+			org, _ := service.GetOrgById(int64(apps.OrgId))
+
+			app.OrgId = apps.OrgId
+			app.Creator = int(org.Creator)
+			app.Pid = xt_temp_org_app.Id
+			app.Id = 0
+			app.Number = 9
+			app.Status = 1
+			app.ModifyTime = time.Now().Unix()
+			app.CreateTime = time.Now().Unix()
+			service.CreateOrgApp(app)
+		}
+
+		if org_app_15 == nil || org_app_15.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
+			app, _ := service.GetOrgApp(0, 15)
+			//org, _ := service.GetOrgById(int64(12))
+			org, _ := service.GetOrgById(int64(apps.OrgId))
+
+			app.OrgId = apps.OrgId
+			app.Creator = int(org.Creator)
+			app.Pid = xt_temp_org_app.Id
+			app.Number = 10
+			app.Status = 1
+			app.Id = 0
+			app.ModifyTime = time.Now().Unix()
+			app.CreateTime = time.Now().Unix()
+			service.CreateOrgApp(app)
+		}
+	}
+
 	for _, role := range org_role {
 		org_ids = append(org_ids, role.OrgId)
 	}
 	//
 	//
 	////创建内置角色
-	//InitRoleAndPurviews(org_ids)
+	InitRoleAndPurviews(org_ids)
 
 	//var org_id int = 0
 	////管理员

controllers/role_controller.go

@@ -356,9 +356,13 @@ func (this *RoleAPIController) AdminMainView() {
 		if adminUserInfo.AdminUser.Id != 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 id != 0 {
+					role, _ := service.GetRoleByRoleID(id)
+					if role != nil {
+						if role.IsSystem == 1 && role.RoleName == "子管理员" {
+							isSubSuperAdmin = true
+						}
+					}
 				}
 			}
 		}
@@ -421,9 +425,13 @@ func (this *RoleAPIController) AddAdminInitData() {
 		if adminUserInfo.AdminUser.Id != 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 id != 0 {
+					role, _ := service.GetRoleByRoleID(id)
+					if role != nil {
+						if role.IsSystem == 1 && role.RoleName == "子管理员" {
+							isSubSuperAdmin = true
+						}
+					}
 				}
 			}
 		}
@@ -570,9 +578,11 @@ func (this *RoleAPIController) EditAdminInitData() {
 		if adminUserInfo.AdminUser.Id != 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 id != 0 {
+					role, _ := service.GetRoleByRoleID(id)
+					if role.IsSystem == 1 && role.RoleName == "子管理员" {
+						isSubSuperAdmin = true
+					}
 				}
 			}
 		}
@@ -836,9 +846,13 @@ func (this *RoleAPIController) GetAllOrgRole() {
 		if adminUserInfo.AdminUser.Id != 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 id != 0 {
+					role, _ := service.GetRoleByRoleID(id)
+					if role != nil {
+						if role.IsSystem == 1 && role.RoleName == "子管理员" {
+							isSubSuperAdmin = true
+						}
+					}
 				}
 			}
 		}
@@ -871,9 +885,13 @@ func (this *RoleAPIController) GetAllOrgUser() {
 		if adminUserInfo.AdminUser.Id != 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 id != 0 {
+					role, _ := service.GetRoleByRoleID(id)
+					if role != nil {
+						if role.IsSystem == 1 && role.RoleName == "子管理员" {
+							isSubSuperAdmin = true
+						}
+					}
 				}
 			}
 		}
@@ -914,9 +932,11 @@ func (this *RoleAPIController) GetRoleStaff() {
 		if adminUserInfo.AdminUser.Id != 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 id != 0 {
+					role, _ := service.GetRoleByRoleID(id)
+					if role.IsSystem == 1 && role.RoleName == "子管理员" {
+						isSubSuperAdmin = true
+					}
 				}
 			}
 		}

service/role_service.go

@@ -45,9 +45,13 @@ func GetAppRole(orgID int64, appID int64, adminUserID int64) (*models.App_Role,
 		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 id != 0 {
+				role, _ := GetRoleByRoleID(id)
+				if role != nil {
+					if role.IsSystem == 1 && role.RoleName == "子管理员" {
+						appRole.IsSubSuperAdmin = true
+					}
+				}
 			}
 		}
 	}
@@ -164,17 +168,22 @@ func GetAdminUsersAndLoginInfo(orgID int64, appID int64, page int, count int) ([
 			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 id != 0 {
+					role, _ := GetRoleByRoleID(id)
+					if role != nil {
+						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
+						}
+					}
 				}
 			}
+
 		}
 
 		//admin, _ := GetAdminUserByUserID(int64(item.AdminUserId))
@@ -612,9 +621,13 @@ func GetAllAdminUsersAndRole(orgID int64, appID int64, page int, count int) ([]*
 			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 id != 0 {
+					role, _ := GetRoleByRoleID(id)
+					if role != nil {
+						if role.IsSystem == 1 && role.RoleName == "子管理员" {
+							items.IsSubAdmin = true
+						}
+					}
 				}
 			}
 		}