From fad13077f60dcd1501e2806af4ce035150665088 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com>
Date: Tue, 18 Oct 2022 10:19:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BF=E5=AE=A2=E8=B4=A6=E6=88=B7=E6=B3=A8?=
 =?UTF-8?q?=E5=86=8C=E6=97=B6=E5=85=B3=E8=81=94=E5=B7=B2=E6=9C=89=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/hrm/views.py | 9 ---------
 apps/vm/views.py  | 7 ++++++-
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/apps/hrm/views.py b/apps/hrm/views.py
index 9dc442b2..0d8bb75f 100755
--- a/apps/hrm/views.py
+++ b/apps/hrm/views.py
@@ -57,15 +57,6 @@ class EmployeeViewSet(CustomModelViewSet):
         个人信息
         """
         user = request.user
-        Employee.objects.get_or_create(user=user,
-                                       defaults={
-                                           "user": user,
-                                           "name": user.name,
-                                           "phone": user.phone,
-                                           "belong_dept": user.belong_dept,
-                                           "post": user.post,
-                                           "type": user.type
-                                       })
         return Response(EmployeeSerializer(instance=user.employee).data)
 
     @action(methods=['post'], detail=False, permission_classes=[IsAuthenticated],
diff --git a/apps/vm/views.py b/apps/vm/views.py
index a5db8bd4..3f0b4d85 100644
--- a/apps/vm/views.py
+++ b/apps/vm/views.py
@@ -1,6 +1,7 @@
 
 from apps.auth1.services import check_phone_code
 from apps.auth1.views import get_tokens_for_user
+from apps.hrm.models import Employee
 from apps.system.models import User
 from apps.utils.tools import ranstr
 from apps.utils.viewsets import CustomGenericViewSet, CustomModelViewSet
@@ -101,7 +102,8 @@ class VisitorViewSet(CustomModelViewSet):
         check_phone_code(phone, code)
         # 查询是否已注册
         user = User.objects.filter(phone=phone).first()
-        if user:
+        ep = Employee.objects.get_queryset(all=True).filter(phone=phone, user=None).first()
+        if user or ep:
             raise ParseError('该手机号已注册,请直接登录')
         # 访客/司机账户创建
         user = User()
@@ -115,6 +117,9 @@ class VisitorViewSet(CustomModelViewSet):
         user.wx_openid = vdata.get('wx_openid', None)
         user.wxmp_openid = vdata.get('wxmp_openid', None)
         user.save()
+        ep.user = user
+        ep.is_deleted = False
+        ep.save()
         return Response(get_tokens_for_user(user))