Browse Source

运维帮助

hujingpei 4 years ago
parent
commit
7d025f2942

+ 1 - 1
apps/tenant/notices/models.py

@@ -31,7 +31,7 @@ class Notices(models.Model):
     title = models.CharField(max_length=50, verbose_name=u'标题')
     title = models.CharField(max_length=50, verbose_name=u'标题')
     create_time = models.DateTimeField(verbose_name='发布时间', auto_now_add=True)
     create_time = models.DateTimeField(verbose_name='发布时间', auto_now_add=True)
     create_user = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name=u"创建者", on_delete=models.PROTECT,
     create_user = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name=u"创建者", on_delete=models.PROTECT,
-                                    editable=False,),
+                                    editable=False,)
     tenant = models.ForeignKey(Tenant, verbose_name=u'企业', on_delete=models.PROTECT, blank=True)
     tenant = models.ForeignKey(Tenant, verbose_name=u'企业', on_delete=models.PROTECT, blank=True)
     type = models.PositiveSmallIntegerField(verbose_name=u'通知类型', choices=TYPE_CHOICES, default=NOTICE)
     type = models.PositiveSmallIntegerField(verbose_name=u'通知类型', choices=TYPE_CHOICES, default=NOTICE)
     range = models.PositiveSmallIntegerField(verbose_name=u'通知范围', choices=RANGE_CHOICES, default=ALL)
     range = models.PositiveSmallIntegerField(verbose_name=u'通知范围', choices=RANGE_CHOICES, default=ALL)

+ 1 - 1
apps/tenant/operation_help/models.py

@@ -68,7 +68,7 @@ class OperationHelpUpfile(models.Model):
 
 
         radio_size = os.path.getsize(fullname)
         radio_size = os.path.getsize(fullname)
         self.radio_size = "%.2f" % (radio_size/(1024*1024))
         self.radio_size = "%.2f" % (radio_size/(1024*1024))
-        self.file__ath = "%s%s" % (settings.MEDIA_URL, filename)
+        self.file_path = "%s%s" % (settings.MEDIA_URL, filename)
         self.save()
         self.save()
 
 
     def del_file(self):
     def del_file(self):

+ 7 - 1
apps/tenant/operation_help/serializer.py

@@ -19,8 +19,14 @@ class OperationHelpSerializer(serializers.ModelSerializer):
         user = self.context['request'].user
         user = self.context['request'].user
         validated_data['create_user'] = user
         validated_data['create_user'] = user
         validated_data['tenant'] = self.context['request'].user.employee.tenant
         validated_data['tenant'] = self.context['request'].user.employee.tenant
+        content = self.initial_data['content']
         instance = super(OperationHelpSerializer, self).create(validated_data)
         instance = super(OperationHelpSerializer, self).create(validated_data)
-        OperationHelpUpfile.objects.filter(tenant=instance.tenant,operation_help__isnull=True,).update(operation_help=instance)
+        operation_files = OperationHelpUpfile.objects.filter(tenant=instance.tenant,operation_help__isnull=True)
+        for operation_file in operation_files:
+            if operation_file.file_path in content:
+                operation_file.update(operation_help=instance)
+            else:
+                operation_file.del_file()
         return instance
         return instance
 
 
     def update(self, instance, validated_data):
     def update(self, instance, validated_data):