diff --git a/apps/application/migrations/0002_alter_application_user_alter_chat_id.py b/apps/application/migrations/0002_alter_application_user_alter_chat_id.py index 090477bae..a57411465 100644 --- a/apps/application/migrations/0002_alter_application_user_alter_chat_id.py +++ b/apps/application/migrations/0002_alter_application_user_alter_chat_id.py @@ -1,7 +1,7 @@ # Generated by Django 5.2.1 on 2025-06-24 09:53 import django.db.models.deletion -import uuid +import uuid_utils.compat from django.db import migrations, models @@ -21,6 +21,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='chat', name='id', - field=models.UUIDField(default=uuid.UUID('0197a15b-1024-7930-b06c-75dfaf6cba43'), editable=False, primary_key=True, serialize=False, verbose_name='主键id'), + field=models.UUIDField(default=uuid_utils.compat.uuid7, editable=False, primary_key=True, serialize=False, verbose_name='主键id'), ), ] diff --git a/apps/application/models/application_chat.py b/apps/application/models/application_chat.py index 00510bf15..139373449 100644 --- a/apps/application/models/application_chat.py +++ b/apps/application/models/application_chat.py @@ -25,7 +25,7 @@ class ChatUserType(models.TextChoices): class Chat(AppModelMixin): - id = models.UUIDField(primary_key=True, max_length=128, default=uuid.uuid7(), editable=False, verbose_name="主键id") + id = models.UUIDField(primary_key=True, max_length=128, default=uuid.uuid7, editable=False, verbose_name="主键id") application = models.ForeignKey(Application, on_delete=models.CASCADE) abstract = models.CharField(max_length=1024, verbose_name="摘要") chat_user_id = models.UUIDField(verbose_name="客户端id", default=None, null=True) diff --git a/apps/system_manage/migrations/0002_alter_workspaceuserresourcepermission_user.py b/apps/system_manage/migrations/0002_alter_workspaceuserresourcepermission_user.py new file mode 100644 index 000000000..08a252c6b --- /dev/null +++ b/apps/system_manage/migrations/0002_alter_workspaceuserresourcepermission_user.py @@ -0,0 +1,20 @@ +# Generated by Django 5.2.1 on 2025-06-24 10:02 + +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('system_manage', '0001_initial'), + ('users', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='workspaceuserresourcepermission', + name='user', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='users.user', verbose_name='工作空间下的用户'), + ), + ] diff --git a/apps/system_manage/models/workspace_user_permission.py b/apps/system_manage/models/workspace_user_permission.py index 590f7e32b..e853b850c 100644 --- a/apps/system_manage/models/workspace_user_permission.py +++ b/apps/system_manage/models/workspace_user_permission.py @@ -31,7 +31,7 @@ class WorkspaceUserResourcePermission(models.Model): workspace_id = models.CharField(max_length=128, verbose_name="工作空间id", default="default") - user = models.ForeignKey(User, on_delete=models.DO_NOTHING, verbose_name="工作空间下的用户") + user = models.ForeignKey(User, on_delete=models.CASCADE, verbose_name="工作空间下的用户") auth_target_type = models.CharField(verbose_name='授权目标', max_length=128, choices=AuthTargetType.choices, default=AuthTargetType.KNOWLEDGE)