合并分支 'dev' 到 'test'

fix:调整批量删除参数



查看合并请求 !56

@@ -59,8 +59,8 @@ type EmployeeData struct {
 
 
 //DeleteUserData 批量删除用户
 //DeleteUserData 批量删除用户
 type DeleteUserData struct {
 type DeleteUserData struct {
-	CompanyId int64   `json:"companyId"`
-	Ids       []int64 `json:"ids"`
+	//CompanyId int64   `json:"companyId"`
+	Ids []int64 `json:"ids"`
 }
 }
 
 
 //ForbidAllowUserData 禁用启用用户
 //ForbidAllowUserData 禁用启用用户
@@ -404,8 +404,8 @@ func (service SyncEmployeeService) deleteEmployeeData(data DeleteUserData) error
 		ids = append(ids, d)
 		ids = append(ids, d)
 	}
 	}
 	_, columnSettingsFound, err := columnSettingRepository.Find(domain.ColumnSettingFindQuery{
 	_, columnSettingsFound, err := columnSettingRepository.Find(domain.ColumnSettingFindQuery{
-		Ids:       ids,
-		CompanyId: int(data.CompanyId),
+		Ids: ids,
+		//CompanyId: int(data.CompanyId),
 	})
 	})
 	if err != nil {
 	if err != nil {
 		return lib.ThrowError(lib.INTERNAL_SERVER_ERROR, err.Error())
 		return lib.ThrowError(lib.INTERNAL_SERVER_ERROR, err.Error())