diff --git a/apps/develop/views.py b/apps/develop/views.py index 71e8bd6e..39f4dc18 100755 --- a/apps/develop/views.py +++ b/apps/develop/views.py @@ -121,6 +121,19 @@ class BackupMedia(APIView): class CorrectViewSet(CustomGenericViewSet): permission_classes = [IsAdminUser] + @action(methods=['post'], detail=False, serializer_class=Serializer) + def employee(self, request, pk=None): + """矫正员工信息 + """ + from apps.system.models import User + from apps.hrm.models import Employee + for user in User.objects.all(): + Employee.objects.get_or_create(user=user, defaults={ + 'user': user, + 'name': user.name, + 'phone': user.phone, + 'type': user.type + }) @action(methods=['post'], detail=False, serializer_class=Serializer) def ticket_sn(self, request, pk=None): """矫正工单流水号 diff --git a/apps/system/views.py b/apps/system/views.py index 65a7585a..e982150d 100755 --- a/apps/system/views.py +++ b/apps/system/views.py @@ -438,11 +438,11 @@ class UserViewSet(CustomModelViewSet): def perform_update(self, serializer): instance = serializer.save() ep = Employee.objects.get_queryset(all=True).filter(user=instance).first() - ep2 = Employee.objects.get_queryset(all=True).filter(phone=instance.phone).first() + # ep2 = Employee.objects.get_queryset(all=True).filter(phone=instance.phone).first() if ep: pass - elif ep2: - ep = ep2 + # elif ep2: + # ep = ep2 else: ep = Employee() ep.user = instance @@ -462,11 +462,11 @@ class UserViewSet(CustomModelViewSet): serializer.is_valid(raise_exception=True) instance = serializer.save(password=password, belong_dept=None) ep = Employee.objects.get_queryset(all=True).filter(user=instance).first() - ep2 = Employee.objects.get_queryset(all=True).filter(phone=instance.phone).first() + # ep2 = Employee.objects.get_queryset(all=True).filter(phone=instance.phone).first() if ep: pass - elif ep2: - ep = ep2 + # elif ep2: + # ep = ep2 else: ep = Employee() ep.user = instance