From 22982f33326495973cf42f7303d89424dcfded84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= Date: Tue, 5 Nov 2019 16:33:38 +0300 Subject: [PATCH] Add employee fix --- apps/establishment/management/commands/add_employee.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/establishment/management/commands/add_employee.py b/apps/establishment/management/commands/add_employee.py index 49eaa056..6fbf562f 100644 --- a/apps/establishment/management/commands/add_employee.py +++ b/apps/establishment/management/commands/add_employee.py @@ -2,7 +2,7 @@ from django.core.management.base import BaseCommand from django.db import connections from establishment.management.commands.add_position import namedtuplefetchall from establishment.models import Employee - +from django.db.models import Q class Command(BaseCommand): @@ -30,8 +30,7 @@ class Command(BaseCommand): def handle(self, *args, **options): objects = [] for e in self.employees_sql(): - count = Employee.objects.filter(old_id=e.profile_id).count() - count += Employee.objects.filter(name=e.name).count() + count = Employee.objects.filter(Q(old_id=e.profile_id) | Q(name=e.name)).count() if count == 0: objects.append(Employee(name=e.name, old_id=e.profile_id)) print(e.name)