fix

controllers/sys_admin.go

@@ -176,7 +176,7 @@ func (this *SysAdminController) ListSysuser() {
 			if item.DepartmentName != "" {
 				if item.GroupName == "" {
 					list[i].DepartmentGroup = item.DepartmentName
-				} else if secondName != nil {
+				} else if secondName != nil && *secondName != `` {
 					list[i].DepartmentGroup = item.DepartmentName + "/" + *secondName + "/" + item.GroupName
 				} else {
 					list[i].DepartmentGroup = item.DepartmentName + "/" + item.GroupName
@@ -391,7 +391,7 @@ func (this *SysAdminController) Add() {
 		br.ErrMsg = "获取角色数据失败，Err:" + err.Error()
 		return
 	}
-	if roleItem != nil {
+	if roleItem.RoleId > 0 {
 		roleName = roleItem.RoleName
 	}
 	if req.DepartmentId > 0 {
@@ -405,7 +405,7 @@ func (this *SysAdminController) Add() {
 			br.ErrMsg = "获取部门数据失败，Err:" + err.Error()
 			return
 		}
-		if departmentItem != nil {
+		if departmentItem.DepartmentId > 0 {
 			departmentName = departmentItem.DepartmentName
 		}
 	}
@@ -421,7 +421,7 @@ func (this *SysAdminController) Add() {
 			br.ErrMsg = "获取分组数据失败，Err:" + err.Error()
 			return
 		}
-		if groupItem != nil {
+		if groupItem.GroupId > 0 {
 			groupName = groupItem.GroupName
 		}
 	}
@@ -437,7 +437,7 @@ func (this *SysAdminController) Add() {
 			br.ErrMsg = "获取小组数据失败，Err:" + err.Error()
 			return
 		}
-		if teamItem != nil {
+		if teamItem.GroupId > 0 {
 			teamName = teamItem.GroupName
 		}
 	}
@@ -624,14 +624,17 @@ func (this *SysAdminController) Edit() {
 
 	// 根据用户登录用户名获取用户信息
 	item, err := system.GetSysAdminByName(req.AdminName)
-	if err != nil && !utils.IsErrNoRow(err) {
-		br.Msg = "获取数据失败"
-		br.ErrMsg = "获取系统用户数据失败，Err:" + err.Error() + ";AdminName:" + req.AdminName
-		return
-	}
-	if item != nil && item.AdminId != req.AdminId {
-		br.Msg = "账号名称已存在,请重新输入"
-		return
+	if err != nil {
+		if !utils.IsErrNoRow(err) {
+			br.Msg = "获取数据失败"
+			br.ErrMsg = "获取系统用户数据失败，Err:" + err.Error() + ";AdminName:" + req.AdminName
+			return
+		}
+	} else {
+		if item.AdminId != req.AdminId {
+			br.Msg = "账号名称已存在,请重新输入"
+			return
+		}
 	}
 
 	// 手机号和邮箱必填一个
@@ -667,14 +670,17 @@ func (this *SysAdminController) Edit() {
 			return
 		}
 		emailUser, e := system.GetSysUserByEmail(req.Email)
-		if e != nil && !utils.IsErrNoRow(e) {
-			br.Msg = "操作失败"
-			br.ErrMsg = "邮箱获取用户信息失败, Err: " + e.Error()
-			return
-		}
-		if emailUser != nil && emailUser.AdminId != adminInfo.AdminId {
-			br.Msg = "邮箱已存在, 请检查"
-			return
+		if e != nil {
+			if !utils.IsErrNoRow(e) {
+				br.Msg = "操作失败"
+				br.ErrMsg = "邮箱获取用户信息失败, Err: " + e.Error()
+				return
+			}
+		} else {
+			if emailUser.AdminId != adminInfo.AdminId {
+				br.Msg = "邮箱已存在, 请检查"
+				return
+			}
 		}
 	}
 
@@ -692,7 +698,7 @@ func (this *SysAdminController) Edit() {
 		br.ErrMsg = "获取角色数据失败，Err:" + err.Error()
 		return
 	}
-	if roleItem != nil {
+	if roleItem.RoleId > 0 {
 		roleName = roleItem.RoleName
 	}
 
@@ -1025,7 +1031,7 @@ func (this *SysAdminController) Move() {
 			br.ErrMsg = "获取部门数据失败，Err:" + err.Error()
 			return
 		}
-		if departmentItem != nil {
+		if departmentItem.DepartmentId > 0 {
 			departmentName = departmentItem.DepartmentName
 		}
 	}
@@ -1036,7 +1042,7 @@ func (this *SysAdminController) Move() {
 			br.ErrMsg = "获取分组数据失败，Err:" + err.Error()
 			return
 		}
-		if groupItem != nil {
+		if groupItem.GroupId > 0 {
 			groupName = groupItem.GroupName
 		}
 	}
@@ -1047,7 +1053,7 @@ func (this *SysAdminController) Move() {
 			br.ErrMsg = "获取小组数据失败，Err:" + err.Error()
 			return
 		}
-		if teamItem != nil {
+		if teamItem.GroupId > 0 {
 			teamName = teamItem.GroupName
 		}
 	}