diff --git a/server/apps/supervision/serializers.py b/server/apps/supervision/serializers.py index dd63a74..6b6571e 100644 --- a/server/apps/supervision/serializers.py +++ b/server/apps/supervision/serializers.py @@ -132,7 +132,7 @@ class ValidateMixin: def validate(self, attrs): task2do = attrs.get('task2do', None) attrs['create_by'] = self.context['request'].user - attrs['belong_dept'] = self.context['request'].user.belong_dept + attrs['belong_dept'] = self.context['request'].user.dept if task2do: if task2do.task2.state == Task2.TASK2_CLOSE: raise ParseError('任务已关闭不可处理') @@ -153,7 +153,7 @@ class PgoalDeptSerializer(serializers.ModelSerializer): def validate(self, attrs): task2do = attrs.get('task2do', None) attrs['create_by'] = self.context['request'].user - attrs['belong_dept'] = self.context['request'].user.belong_dept + attrs['belong_dept'] = self.context['request'].user.dept if task2do: if task2do.task2.state == Task2.TASK2_CLOSE: raise ParseError('任务已关闭不可处理') diff --git a/server/apps/supervision/views.py b/server/apps/supervision/views.py index c706bec..750c0d5 100644 --- a/server/apps/supervision/views.py +++ b/server/apps/supervision/views.py @@ -550,8 +550,8 @@ class Domixin: filterset_fields = ['task2do', 'task2do__task2', 'task2do__belong_dept'] def countnum_task2do_field(self, task2do): - for k, v in self.count_dict: - setattr(task2do, k, self.queryset.model.objects.filter({**{'task2do': task2do}, **v}).count()) + for k, v in self.count_dict.items(): + setattr(task2do, k, self.queryset.model.objects.filter(**{**{'task2do': task2do}, **v}).count()) task2do.save() # 更新count_up字段 Task2DoViewSet.countup_task2do(task2do)