apps/system/filters.py

@@ -7,7 +7,6 @@ from rest_framework.exceptions import ParseError
 class UserFilterSet(filters.FilterSet):
     ubelong_dept__name = filters.CharFilter(label='归属于该部门及以下(按名称)', method='filter_ubelong_dept__name')
     ubelong_dept = filters.CharFilter(label='归属于该部门及以下', method='filter_ubelong_dept')
-    has_perm = filters.CharFilter(label='拥有指定权限标识', method='filter_has_perm')
 
     class Meta:
         model = User
@@ -39,9 +38,6 @@ class UserFilterSet(filters.FilterSet):
             raise ParseError(f"部门ID错误: {value} {str(e)}")
         return queryset.filter(belong_dept__in=depts)
 
-    def filter_has_perm(self, queryset, name, value):
-        return queryset.filter(up_user__post__pr_post__role__perms__codes__contains=value)
-
 
 class DeptFilterSet(filters.FilterSet):
 

apps/system/migrations/0007_alter_dept_create_by_alter_dept_third_info_and_more.py

@@ -1,120 +0,0 @@
-# Generated by Django 4.2.27 on 2026-01-16 06:41
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('system', '0006_auto_20241213_1249'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='dept',
-            name='create_by',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人'),
-        ),
-        migrations.AlterField(
-            model_name='dept',
-            name='third_info',
-            field=models.JSONField(blank=True, default=dict, verbose_name='三方系统信息'),
-        ),
-        migrations.AlterField(
-            model_name='dept',
-            name='update_by',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人'),
-        ),
-        migrations.AlterField(
-            model_name='dictionary',
-            name='create_by',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人'),
-        ),
-        migrations.AlterField(
-            model_name='dictionary',
-            name='update_by',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人'),
-        ),
-        migrations.AlterField(
-            model_name='dicttype',
-            name='create_by',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人'),
-        ),
-        migrations.AlterField(
-            model_name='dicttype',
-            name='update_by',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人'),
-        ),
-        migrations.AlterField(
-            model_name='file',
-            name='create_by',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人'),
-        ),
-        migrations.AlterField(
-            model_name='file',
-            name='update_by',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人'),
-        ),
-        migrations.AlterField(
-            model_name='myschedule',
-            name='create_by',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人'),
-        ),
-        migrations.AlterField(
-            model_name='myschedule',
-            name='update_by',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人'),
-        ),
-        migrations.AlterField(
-            model_name='post',
-            name='create_by',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人'),
-        ),
-        migrations.AlterField(
-            model_name='post',
-            name='update_by',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人'),
-        ),
-        migrations.AlterField(
-            model_name='postrole',
-            name='post',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='pr_post', to='system.post', verbose_name='关联岗位'),
-        ),
-        migrations.AlterField(
-            model_name='postrole',
-            name='role',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='pr_role', to='system.role', verbose_name='关联角色'),
-        ),
-        migrations.AlterField(
-            model_name='role',
-            name='create_by',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人'),
-        ),
-        migrations.AlterField(
-            model_name='role',
-            name='update_by',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人'),
-        ),
-        migrations.AlterField(
-            model_name='user',
-            name='belong_dept',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_belong_dept', to='system.dept', verbose_name='所属部门'),
-        ),
-        migrations.AlterField(
-            model_name='user',
-            name='create_by',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人'),
-        ),
-        migrations.AlterField(
-            model_name='user',
-            name='roles',
-            field=models.ManyToManyField(blank=True, to='system.role', verbose_name='关联角色'),
-        ),
-        migrations.AlterField(
-            model_name='user',
-            name='update_by',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人'),
-        ),
-    ]

apps/system/models.py

@@ -54,7 +54,7 @@ class Dept(ParentModel, CommonAModel):
     name = models.CharField('名称', max_length=60)
     type = models.CharField('类型', max_length=20, default='dept')
     sort = models.PositiveSmallIntegerField('排序标记', default=1)
-    third_info = models.JSONField('三方系统信息', default=dict, blank=True)
+    third_info = models.JSONField('三方系统信息', default=dict)
 
     class Meta:
         verbose_name = '部门'
@@ -109,9 +109,9 @@ class PostRole(BaseModel):
     data_range = models.PositiveSmallIntegerField('数据权限范围', choices=DataFilter.choices,
                                                   default=DataFilter.THISLEVEL_AND_BELOW)
     post = models.ForeignKey(Post, verbose_name='关联岗位',
-                             on_delete=models.CASCADE, related_name="pr_post")
+                             on_delete=models.CASCADE)
     role = models.ForeignKey(Role, verbose_name='关联角色',
-                             on_delete=models.CASCADE, related_name='pr_role')
+                             on_delete=models.CASCADE)
 
 
 class SoftDeletableUserManager(SoftDeletableManagerMixin, UserManager):
@@ -134,7 +134,7 @@ class User(AbstractUser, CommonBModel):
     posts = models.ManyToManyField(
         Post, through='system.userpost', related_name='user_posts')
     depts = models.ManyToManyField(Dept, through='system.userpost')
-    roles = models.ManyToManyField(Role, verbose_name='关联角色', blank=True)
+    roles = models.ManyToManyField(Role, verbose_name='关联角色')
 
     # 关联账号
     secret = models.CharField('密钥', max_length=100, null=True, blank=True)