diff --git a/dvadmin-backend/apps/vadmin/op_drf/models.py b/dvadmin-backend/apps/vadmin/op_drf/models.py index 1eead22..2bffdeb 100644 --- a/dvadmin-backend/apps/vadmin/op_drf/models.py +++ b/dvadmin-backend/apps/vadmin/op_drf/models.py @@ -1,3 +1,4 @@ +from django.conf import settings from django.db import models from django.db.models import SET_NULL @@ -24,7 +25,7 @@ class CoreModel(models.Model): 增加审计字段, 覆盖字段时, 字段名称请勿修改, 必须统一审计字段名称 """ description = DescriptionField() # 描述 - creator = models.ForeignKey(to='permission.UserProfile', related_query_name='creator_query', null=True, + creator = models.ForeignKey(to=settings.AUTH_USER_MODEL, related_query_name='creator_query', null=True, verbose_name='创建者', on_delete=SET_NULL, db_constraint=False) # 创建者 modifier = ModifierCharField() # 修改者 dept_belong_id = models.CharField(max_length=64, verbose_name="数据归属部门", null=True, blank=True) diff --git a/dvadmin-backend/apps/vadmin/permission/filters.py b/dvadmin-backend/apps/vadmin/permission/filters.py index bf302b1..8f8d8da 100644 --- a/dvadmin-backend/apps/vadmin/permission/filters.py +++ b/dvadmin-backend/apps/vadmin/permission/filters.py @@ -1,8 +1,11 @@ import django_filters +from django.contrib.auth import get_user_model -from ..permission.models import Menu, Dept, Post, Role, UserProfile +from ..permission.models import Menu, Dept, Post, Role from ..utils.model_util import get_dept +UserProfile = get_user_model() + class MenuFilter(django_filters.rest_framework.FilterSet): """ diff --git a/dvadmin-backend/apps/vadmin/permission/models/users.py b/dvadmin-backend/apps/vadmin/permission/models/users.py index e609a2a..fb1818e 100644 --- a/dvadmin-backend/apps/vadmin/permission/models/users.py +++ b/dvadmin-backend/apps/vadmin/permission/models/users.py @@ -1,5 +1,6 @@ from uuid import uuid4 +from django.conf import settings from django.contrib.auth.models import UserManager, AbstractUser from django.core.cache import cache from django.db.models import IntegerField, ForeignKey, CharField, TextField, ManyToManyField, CASCADE @@ -51,6 +52,7 @@ class UserProfile(AbstractUser, CoreModel): return cache.delete(f'permission_interface_dict_{self.username}') class Meta: + abstract = settings.AUTH_USER_MODEL != 'permission.UserProfile' verbose_name = '用户管理' verbose_name_plural = verbose_name diff --git a/dvadmin-backend/apps/vadmin/permission/serializers.py b/dvadmin-backend/apps/vadmin/permission/serializers.py index 8fc641e..ac82342 100644 --- a/dvadmin-backend/apps/vadmin/permission/serializers.py +++ b/dvadmin-backend/apps/vadmin/permission/serializers.py @@ -1,10 +1,13 @@ +from django.contrib.auth import get_user_model from rest_framework import serializers from rest_framework.validators import UniqueValidator from ..op_drf.serializers import CustomModelSerializer -from ..permission.models import Menu, Dept, Post, Role, UserProfile +from ..permission.models import Menu, Dept, Post, Role from ..system.models import MessagePush +UserProfile = get_user_model() + # ================================================= # # ************** 菜单管理 序列化器 ************** # diff --git a/dvadmin-backend/apps/vadmin/permission/views.py b/dvadmin-backend/apps/vadmin/permission/views.py index 8ece4fa..f11def9 100644 --- a/dvadmin-backend/apps/vadmin/permission/views.py +++ b/dvadmin-backend/apps/vadmin/permission/views.py @@ -1,4 +1,4 @@ -from django.contrib.auth import authenticate +from django.contrib.auth import authenticate, get_user_model from rest_framework.request import Request from rest_framework.views import APIView @@ -6,7 +6,7 @@ from .permissions import CommonPermission, DeptDestroyPermission from ..op_drf.filters import DataLevelPermissionsFilter from ..op_drf.viewsets import CustomModelViewSet from ..permission.filters import MenuFilter, DeptFilter, PostFilter, RoleFilter, UserProfileFilter -from ..permission.models import Role, Menu, Dept, Post, UserProfile +from ..permission.models import Role, Menu, Dept, Post from ..permission.serializers import UserProfileSerializer, MenuSerializer, RoleSerializer, \ MenuCreateUpdateSerializer, DeptSerializer, DeptCreateUpdateSerializer, PostSerializer, PostCreateUpdateSerializer, \ RoleCreateUpdateSerializer, DeptTreeSerializer, MenuTreeSerializer, UserProfileCreateUpdateSerializer, \ @@ -15,6 +15,8 @@ from ..permission.serializers import UserProfileSerializer, MenuSerializer, Role from ..system.models import DictDetails from ..utils.response import SuccessResponse, ErrorResponse +UserProfile = get_user_model() + class GetUserProfileView(APIView): """ diff --git a/dvadmin-backend/apps/vadmin/system/models/message_push.py b/dvadmin-backend/apps/vadmin/system/models/message_push.py index efbde44..04ad68e 100644 --- a/dvadmin-backend/apps/vadmin/system/models/message_push.py +++ b/dvadmin-backend/apps/vadmin/system/models/message_push.py @@ -1,10 +1,11 @@ +from django.contrib.auth import get_user_model from django.db import models from django.db.models import * from ...op_drf.fields import UpdateDateTimeField, CreateDateTimeField from ...op_drf.models import CoreModel -from ...permission.models import UserProfile +UserProfile = get_user_model() """ 消息通知模型 """