wushaodong il y a 4 ans
Parent
commit
8a615e22e1
2 fichiers modifiés avec 3 ajouts et 2 suppressions
  1. 2 1
      apps/admin/tenant/views.py
  2. 1 1
      apps/tenant/notices/models.py

+ 2 - 1
apps/admin/tenant/views.py

@@ -63,7 +63,7 @@ class TenantViewSet(CustomModelViewSet):
                 if user:
                     user.type = User.SUPER
                     user.save()
-                    Employee.objects.filter(user=user).update(tenant=tenant, type=Employee.SUPER)
+                    Employee.objects.filter(user=user).update(tenant=tenant,name=name, type=Employee.SUPER)
                 else:
                     user = Employee.create_super_admin(tenant, name, username, password)
                 option_data1 = {
@@ -156,6 +156,7 @@ class MemberRemindViewSet(APIView):
                 'title': '会员到期提醒,请点击查看!',
                 'content': '您的会员还有{0}天到期!请及时续费,以免影响您的正常使用!'.format(diff),
                 'tenant': tenant,
+                'create_user': request.user,
                 'type': Notices.RENEW,
                 'range': Notices.ADMIN,
                 # 'end_time': (timezone.now() + datetime.timedelta(days=int(diff))).strftime('%Y-%m-%d'),

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

@@ -31,7 +31,7 @@ class Notices(models.Model):
     title = models.CharField(max_length=50, verbose_name=u'标题')
     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,
-                                    editable=False,),
+                                    editable=False,)
     tenant = models.ForeignKey(Tenant, verbose_name=u'企业', on_delete=models.PROTECT, blank=True)
     type = models.PositiveSmallIntegerField(verbose_name=u'通知类型', choices=TYPE_CHOICES, default=NOTICE)
     range = models.PositiveSmallIntegerField(verbose_name=u'通知范围', choices=RANGE_CHOICES, default=ALL)