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

controllers/new_mobile_api_controllers/home_api_controller.go

@@ -50,8 +50,10 @@ func (this *HomeController) GetHomeData() {
 						id, _ := strconv.ParseInt(item, 10, 64)
 						if id > 0 {
 							role, _ := service.GetRoleByRoleID(id)
-							if role.IsSystem == 1 && role.RoleName == "子管理员" {
-								isSubSuperAdmin = true
+							if role != nil {
+								if role.IsSystem == 1 && role.RoleName == "子管理员" {
+									isSubSuperAdmin = true
+								}
 							}
 						}
 					}

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -1000,7 +1000,7 @@ func (this *NewDialysisApiController) ToSearchePatient() {
 	fmt.Print("关键字", keyword)
 	adminUserinfo := this.GetMobileAdminUserInfo()
 	orgid := adminUserinfo.Org.Id
-	fmt.Println("j击鼓ID=--------------------------", orgid)
+	fmt.Println(orgid)
 	patient, err := service.ToSearchePatient(keyword, orgid)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)

controllers/new_mobile_api_controllers/new_role_api_controller.go

@@ -26,9 +26,10 @@ func (this *NewRoleApiController) GetAllOrgUser() {
 				id, _ := strconv.ParseInt(item, 10, 64)
 				if id != 0 {
 					role, _ := service.GetRoleByRoleID(id)
-
-					if role.IsSystem == 1 && role.RoleName == "子管理员" {
-						isSubSuperAdmin = true
+					if role != nil {
+						if role.IsSystem == 1 && role.RoleName == "子管理员" {
+							isSubSuperAdmin = true
+						}
 					}
 				}
 
@@ -104,8 +105,11 @@ func (this *NewRoleApiController) GetAdminUserInfo() {
 				id, _ := strconv.ParseInt(item, 10, 64)
 				if id != 0 {
 					role, _ := service.GetRoleByRoleID(id)
-					if role.IsSystem == 1 && role.RoleName == "子管理员" {
-						isSubSuperAdmin = true
+					if role != nil {
+
+						if role.IsSystem == 1 && role.RoleName == "子管理员" {
+							isSubSuperAdmin = true
+						}
 					}
 				}
 			}
@@ -247,8 +251,10 @@ func (this *NewRoleApiController) GetAllOrgRole() {
 				id, _ := strconv.ParseInt(item, 10, 64)
 				if id != 0 {
 					role, _ := service.GetRoleByRoleID(id)
-					if role.IsSystem == 1 && role.RoleName == "子管理员" {
-						isSubSuperAdmin = true
+					if role != nil {
+						if role.IsSystem == 1 && role.RoleName == "子管理员" {
+							isSubSuperAdmin = true
+						}
 					}
 				}
 			}

controllers/role_controller.go

@@ -358,8 +358,10 @@ func (this *RoleAPIController) AdminMainView() {
 				id, _ := strconv.ParseInt(item, 10, 64)
 				if id != 0 {
 					role, _ := service.GetRoleByRoleID(id)
-					if role.IsSystem == 1 && role.RoleName == "子管理员" {
-						isSubSuperAdmin = true
+					if role != nil {
+						if role.IsSystem == 1 && role.RoleName == "子管理员" {
+							isSubSuperAdmin = true
+						}
 					}
 				}
 			}
@@ -425,8 +427,10 @@ func (this *RoleAPIController) AddAdminInitData() {
 				id, _ := strconv.ParseInt(item, 10, 64)
 				if id != 0 {
 					role, _ := service.GetRoleByRoleID(id)
-					if role.IsSystem == 1 && role.RoleName == "子管理员" {
-						isSubSuperAdmin = true
+					if role != nil {
+						if role.IsSystem == 1 && role.RoleName == "子管理员" {
+							isSubSuperAdmin = true
+						}
 					}
 				}
 			}
@@ -844,8 +848,10 @@ func (this *RoleAPIController) GetAllOrgRole() {
 				id, _ := strconv.ParseInt(item, 10, 64)
 				if id != 0 {
 					role, _ := service.GetRoleByRoleID(id)
-					if role.IsSystem == 1 && role.RoleName == "子管理员" {
-						isSubSuperAdmin = true
+					if role != nil {
+						if role.IsSystem == 1 && role.RoleName == "子管理员" {
+							isSubSuperAdmin = true
+						}
 					}
 				}
 			}
@@ -881,8 +887,10 @@ func (this *RoleAPIController) GetAllOrgUser() {
 				id, _ := strconv.ParseInt(item, 10, 64)
 				if id != 0 {
 					role, _ := service.GetRoleByRoleID(id)
-					if role.IsSystem == 1 && role.RoleName == "子管理员" {
-						isSubSuperAdmin = true
+					if role != nil {
+						if role.IsSystem == 1 && role.RoleName == "子管理员" {
+							isSubSuperAdmin = true
+						}
 					}
 				}
 			}

service/role_service.go

@@ -47,8 +47,10 @@ func GetAppRole(orgID int64, appID int64, adminUserID int64) (*models.App_Role,
 			id, _ := strconv.ParseInt(item, 10, 64)
 			if id != 0 {
 				role, _ := GetRoleByRoleID(id)
-				if role.IsSystem == 1 && role.RoleName == "子管理员" {
-					appRole.IsSubSuperAdmin = true
+				if role != nil {
+					if role.IsSystem == 1 && role.RoleName == "子管理员" {
+						appRole.IsSubSuperAdmin = true
+					}
 				}
 			}
 		}
@@ -168,14 +170,16 @@ func GetAdminUsersAndLoginInfo(orgID int64, appID int64, page int, count int) ([
 				id, _ := strconv.ParseInt(id, 10, 64)
 				if id != 0 {
 					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 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
+						}
 					}
 				}
 			}
@@ -619,8 +623,10 @@ func GetAllAdminUsersAndRole(orgID int64, appID int64, page int, count int) ([]*
 				id, _ := strconv.ParseInt(ids, 10, 64)
 				if id != 0 {
 					role, _ := GetRoleByRoleID(id)
-					if role.IsSystem == 1 && role.RoleName == "子管理员" {
-						items.IsSubAdmin = true
+					if role != nil {
+						if role.IsSystem == 1 && role.RoleName == "子管理员" {
+							items.IsSubAdmin = true
+						}
 					}
 				}
 			}