From 5198ac1cc0a2e20b73c635071844ae23cee2f5b1 Mon Sep 17 00:00:00 2001
From: Bai <baijiangjie@gmail.com>
Date: Wed, 21 Dec 2022 15:16:54 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9=20UserAssetGrantedTr?=
 =?UTF-8?q?eeNodeRelation=20id=20=E4=B8=BA=20AutoField?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ops/migrations/0032_auto_20221221_1513.py | 23 +++++++++++++++++++
 .../migrations/0034_auto_20221220_1956.py     |  5 ----
 apps/perms/models/perm_node.py                |  1 +
 3 files changed, 24 insertions(+), 5 deletions(-)
 create mode 100644 apps/ops/migrations/0032_auto_20221221_1513.py

diff --git a/apps/ops/migrations/0032_auto_20221221_1513.py b/apps/ops/migrations/0032_auto_20221221_1513.py
new file mode 100644
index 000000000..3a706f4b7
--- /dev/null
+++ b/apps/ops/migrations/0032_auto_20221221_1513.py
@@ -0,0 +1,23 @@
+# Generated by Django 3.2.14 on 2022-12-21 07:13
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ops', '0031_auto_20221220_1956'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='historicaljob',
+            name='created_by',
+            field=models.CharField(blank=True, max_length=128, null=True, verbose_name='Created by'),
+        ),
+        migrations.AlterField(
+            model_name='historicaljob',
+            name='updated_by',
+            field=models.CharField(blank=True, max_length=128, null=True, verbose_name='Updated by'),
+        ),
+    ]
diff --git a/apps/perms/migrations/0034_auto_20221220_1956.py b/apps/perms/migrations/0034_auto_20221220_1956.py
index 01b7f0f5f..41f6528d1 100644
--- a/apps/perms/migrations/0034_auto_20221220_1956.py
+++ b/apps/perms/migrations/0034_auto_20221220_1956.py
@@ -41,11 +41,6 @@ class Migration(migrations.Migration):
             name='created_by',
             field=models.CharField(blank=True, max_length=128, null=True, verbose_name='Created by'),
         ),
-        migrations.AlterField(
-            model_name='userassetgrantedtreenoderelation',
-            name='id',
-            field=models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False),
-        ),
         migrations.AlterField(
             model_name='userassetgrantedtreenoderelation',
             name='updated_by',
diff --git a/apps/perms/models/perm_node.py b/apps/perms/models/perm_node.py
index 675e36e9c..89354a06b 100644
--- a/apps/perms/models/perm_node.py
+++ b/apps/perms/models/perm_node.py
@@ -16,6 +16,7 @@ class NodeFrom(TextChoices):
 class UserAssetGrantedTreeNodeRelation(FamilyMixin, JMSOrgBaseModel):
     NodeFrom = NodeFrom
 
+    id = models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name=_('ID'))
     user = models.ForeignKey('users.User', db_constraint=False, on_delete=models.CASCADE)
     node = models.ForeignKey('assets.Node', default=None, on_delete=models.CASCADE,
                              db_constraint=False, null=False, related_name='granted_node_rels')