Merge branch 'dev' into test

@@ -610,6 +610,7 @@ func DeleteEmployeeData(data DeleteUserData) error {
 			deleteUserIds = append(deleteUserIds, userId)
 			deleteUserIds = append(deleteUserIds, userId)
 		}
 		}
 	}
 	}
+	if len(deleteUserIds) > 0 {
 		_, err = o.QueryTable(&models.User{}).
 		_, err = o.QueryTable(&models.User{}).
 			Filter("id__in", deleteUserIds).
 			Filter("id__in", deleteUserIds).
 			Update(orm.Params{
 			Update(orm.Params{
@@ -620,6 +621,7 @@ func DeleteEmployeeData(data DeleteUserData) error {
 			log.Error("更新user数据失败:%s", err)
 			log.Error("更新user数据失败:%s", err)
 			return errors.New("删除user_company数据失败")
 			return errors.New("删除user_company数据失败")
 		}
 		}
+	}
 	o.Commit()
 	o.Commit()
 	return nil
 	return nil
 }
 }