作者 yangfu

用户列表修改

@@ -25,6 +25,7 @@ func (dto *DepartmentUsersDto) LoadDto(subDepartment *allied_creation_user.DataO @@ -25,6 +25,7 @@ func (dto *DepartmentUsersDto) LoadDto(subDepartment *allied_creation_user.DataO
25 mapDepartment[-1] = &Department{ 25 mapDepartment[-1] = &Department{
26 DepartmentID: -1, 26 DepartmentID: -1,
27 DepartmentName: "共创部门", 27 DepartmentName: "共创部门",
  28 + Users: make([]User, 0),
28 } 29 }
29 dto.Departments = append(dto.Departments, mapDepartment[-1]) 30 dto.Departments = append(dto.Departments, mapDepartment[-1])
30 31
@@ -185,6 +185,7 @@ func (usersService *UsersService) CompanyUserList(companyUserListQuery *query.Co @@ -185,6 +185,7 @@ func (usersService *UsersService) CompanyUserList(companyUserListQuery *query.Co
185 UserName: companyUserListQuery.UserName, 185 UserName: companyUserListQuery.UserName,
186 DepName: companyUserListQuery.DepartmentName, 186 DepName: companyUserListQuery.DepartmentName,
187 Phone: "", 187 Phone: "",
  188 + UserType: domain.UserTypeEmployee,
188 }) 189 })
189 190
190 if err != nil { 191 if err != nil {
@@ -368,7 +369,7 @@ func (usersService *UsersService) CooperationUserList(cooperationUserListQuery * @@ -368,7 +369,7 @@ func (usersService *UsersService) CooperationUserList(cooperationUserListQuery *
368 CooperationCompany: cooperationUserListQuery.CooperationCompany, 369 CooperationCompany: cooperationUserListQuery.CooperationCompany,
369 DepName: "", 370 DepName: "",
370 Phone: "", 371 Phone: "",
371 - UserType: 2, 372 + UserType: domain.UserTypeCooperation,
372 }) 373 })
373 var ( 374 var (
374 listData []dto.CooperationUserItem 375 listData []dto.CooperationUserItem