组织架构

models/sys_user.go

@@ -20,6 +20,7 @@ type SysUser struct {
 	SysDepartmentId1 int       `description:"所属部门一级id"`
 	SysDepartmentId2 int       `description:"所属部门二级id"`
 	SysDepartmentId3 int       `description:"所属部门三级id"`
+	SysDepartmentId4 int       `description:"所属部门四级id"`
 	Province         string    `description:"省"`
 	City             string    `description:"市"`
 	PositionName     string    `description:"职位名称"`

services/sys_user.go

@@ -13,9 +13,9 @@ func GetSysUserList(condition string, pars []interface{}, startSize, pageSize in
 	if err != nil {
 		return
 	}
-	departmentIdToName := make(map[int]string)
+	departmentIdToName := make(map[models.DepartmentType]map[int]string)
 	for _, dep := range departmentList {
-		departmentIdToName[dep.SysDepartmentId] = dep.SysDepartmentName
+		departmentIdToName[dep.Type][dep.OutId] = dep.SysDepartmentName
 	}
 	// 匹配系统用户
 	items = make([]*models.SysUserMapping, 0)
@@ -31,9 +31,10 @@ func GetSysUserList(condition string, pars []interface{}, startSize, pageSize in
 				SysRoleId:          user.SysRoleId,
 				SysRoleName:        user.SysRoleName,
 				SysDepartmentId:    user.SysDepartmentId,
-				SysDepartmentName1: departmentIdToName[user.SysDepartmentId1],
-				SysDepartmentName2: departmentIdToName[user.SysDepartmentId2],
-				SysDepartmentName3: departmentIdToName[user.SysDepartmentId3],
+				SysDepartmentName1: departmentIdToName[models.SubCompany][user.SysDepartmentId1],
+				SysDepartmentName2: departmentIdToName[models.SubCompany][user.SysDepartmentId2],
+				SysDepartmentName3: departmentIdToName[models.SubCompany][user.SysDepartmentId3],
+				SysDepartmentName4: departmentIdToName[models.SubCompany][user.SysDepartmentId4],
 				Province:           user.Province,
 				City:               user.City,
 				PositionName:       user.PositionName,