|
@@ -589,12 +589,18 @@ func RemoveUserDepartment(data RemoveUserDepartmentData) error { |
|
@@ -589,12 +589,18 @@ func RemoveUserDepartment(data RemoveUserDepartmentData) error { |
|
589
|
err error
|
589
|
err error
|
|
590
|
companyData *models.Company
|
590
|
companyData *models.Company
|
|
591
|
)
|
591
|
)
|
|
|
|
592
|
+ data.DepartmentIds = utils.ArrayInt64Unique(data.DepartmentIds)
|
|
|
|
593
|
+ data.UserIds = utils.ArrayInt64Unique(data.UserIds)
|
|
592
|
userDepartmentDatas := make(map[int64][]UserDepartData)
|
594
|
userDepartmentDatas := make(map[int64][]UserDepartData)
|
|
593
|
companyData, err = models.GetCompanyByUCenter(data.CompanyId)
|
595
|
companyData, err = models.GetCompanyByUCenter(data.CompanyId)
|
|
594
|
if err != nil {
|
596
|
if err != nil {
|
|
595
|
log.Error("h获取公司数据失败,user_center_id=%d,err:%s", data.CompanyId, err)
|
597
|
log.Error("h获取公司数据失败,user_center_id=%d,err:%s", data.CompanyId, err)
|
|
596
|
return errors.New("获取公司数据失败")
|
598
|
return errors.New("获取公司数据失败")
|
|
597
|
}
|
599
|
}
|
|
|
|
600
|
+ topdepartment, err := models.GetTopDepartmentByCompany(data.CompanyId)
|
|
|
|
601
|
+ if err != nil {
|
|
|
|
602
|
+ log.Error("获取公司一级部门失败;%s")
|
|
|
|
603
|
+ }
|
|
598
|
for _, v := range data.UserIds {
|
604
|
for _, v := range data.UserIds {
|
|
599
|
var userDapart []UserDepartData
|
605
|
var userDapart []UserDepartData
|
|
600
|
for _, vv := range data.DepartmentIds {
|
606
|
for _, vv := range data.DepartmentIds {
|
|
@@ -603,6 +609,9 @@ func RemoveUserDepartment(data RemoveUserDepartmentData) error { |
|
@@ -603,6 +609,9 @@ func RemoveUserDepartment(data RemoveUserDepartmentData) error { |
|
603
|
UserId: v,
|
609
|
UserId: v,
|
|
604
|
DepartmentId: vv,
|
610
|
DepartmentId: vv,
|
|
605
|
}
|
611
|
}
|
|
|
|
612
|
+ if m.DepartmentId == 0 {
|
|
|
|
613
|
+ m.DepartmentId = topdepartment.Id
|
|
|
|
614
|
+ }
|
|
606
|
userDapart = append(userDapart, m)
|
615
|
userDapart = append(userDapart, m)
|
|
607
|
}
|
616
|
}
|
|
608
|
userDepartmentDatas[v] = userDapart
|
617
|
userDepartmentDatas[v] = userDapart
|