zcdsj
/
factory
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

userpost bug

This commit is contained in:
曹前明 2022-09-15 15:56:30 +08:00
parent 840f7c707b
commit dd5faaf619
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/rpm/serializers.py
View File

@ -6,7 +6,7 @@ from apps.system.services import sync_dahua_dept
from apps.utils.constants import EXCLUDE_FIELDS from apps.utils.constants import EXCLUDE_FIELDS
from apps.utils.fields import MyFilePathField from apps.utils.fields import MyFilePathField
from apps.utils.serializers import CustomModelSerializer from apps.utils.serializers import CustomModelSerializer
from apps.system.serializers import DictSerializer, DictSimpleSerializer, FileSerializer from apps.system.serializers import DictSerializer, DictSimpleSerializer, FileSerializer, UserSimpleSerializer
from rest_framework import serializers from rest_framework import serializers
from rest_framework.exceptions import ParseError from rest_framework.exceptions import ParseError
from django.db import transaction from django.db import transaction
@ -50,8 +50,7 @@ class RpartyCreateUpdateSerializer(CustomModelSerializer):
class RpartySerializer(CustomModelSerializer): class RpartySerializer(CustomModelSerializer):
admin_username = serializers.CharField(source='admin.username', read_only=True) admin_ = UserSimpleSerializer(source='admin', read_only=True)
admin_name = serializers.CharField(source='admin.name', read_only=True)
belong_dept_name = serializers.CharField(source='belong_dept.name', read_only=True) belong_dept_name = serializers.CharField(source='belong_dept.name', read_only=True)
class Meta: class Meta:

2
apps/system/views.py
View File

@ -407,7 +407,7 @@ class UserPostViewSet(CreateModelMixin, DestroyModelMixin, ListModelMixin, Custo
user.update_by = self.request.user user.update_by = self.request.user
user.save() user.save()
# 更新人员表 # 更新人员表
ep = Employee.objects.get_queryset(all=True).filter(user=instance).first() ep = Employee.objects.get_queryset(all=True).filter(user=user).first()
if ep: if ep:
ep.belong_dept = user.belong_dept ep.belong_dept = user.belong_dept
ep.post = user.post ep.post = user.post