diff --git a/hb_server/apps/hrm/serializers.py b/hb_server/apps/hrm/serializers.py index 4f70427..9371ff4 100644 --- a/hb_server/apps/hrm/serializers.py +++ b/hb_server/apps/hrm/serializers.py @@ -9,7 +9,7 @@ from django.db.models.query import Prefetch class EmployeeSerializer(DynamicFieldsSerializerMixin, ModelSerializer): name = serializers.CharField(source='user.name', read_only=True) - dept_ = OrganizationSimpleSerializer(source='user.dept_', read_only=True) + dept_ = OrganizationSimpleSerializer(source='user.dept', read_only=True) class Meta: model = Employee exclude = ['face_data'] diff --git a/hb_server/apps/hrm/views.py b/hb_server/apps/hrm/views.py index 988f2be..5bf9457 100644 --- a/hb_server/apps/hrm/views.py +++ b/hb_server/apps/hrm/views.py @@ -89,7 +89,7 @@ class ClockRecordViewSet(CreateModelMixin, ListModelMixin, GenericViewSet): 'create_time':now }) if not created: - ins.create_time = now + ins.update_time = now ins.save() # 设为在岗 user.is_atwork = True