api/branch_campus_admin_views.py

@@ -38,6 +38,7 @@ def update_branch_campus_admin(request):

                     target_admin_id = request.POST.get('target_admin_id', '')
              

                     name = request.POST.get('name', '')
              

                     phone = request.POST.get('phone', '')
              

                +    admin_type = int(request.POST.get('admin_type', 1))
              

                     user_status = request.POST.get('user_status', 0)
              

                 
              

                     password = phone[-6:]
              
@@ -46,6 +47,7 @@ def update_branch_campus_admin(request):

                     BranchCampusAdministratorInfo.objects.filter(
              

                         admin_id=target_admin_id,
              

                     ).update(
              

                +        admin_type=admin_type,
              

                         name=name,
              

                         phone=phone,
              

                         password=password,
              

api/branch_campus_views.py

@@ -50,7 +50,13 @@ def get_branch_campus_list(request):

                 def delete_branch_campus(request):
              

                     campus_id = request.POST.get('campus_id', '')
              

                 
              

                -    if campus_id == "htmRPpdE3PjB4V35uAesxu":
              

                +    try:
              

                +        campus = BranchCampusInfo.objects.get(id=campus_id)
              

                +    except:
              

                +        return response()
              

                +
              

                +
              

                +    if campus.campus_type == BranchCampusInfo.MAIN:
              

                         return response(40001, '', '总院不可删除')
              

                 
              

                     BranchCampusInfo.objects.filter(campus_id=campus_id).update(status=False)
              

api/course_register_views.py

@@ -105,6 +105,9 @@ def course_register_list(request):

                     campus = BranchCampusInfo.objects.get(campus_id=admin.campus_id)
              

                     if campus.campus_type == BranchCampusInfo.BRANCH:
              

                         registers = UserCourseRegisterInfo.objects.filter(campus_id=admin.campus_id)
              

                +
              

                +    if campus.campus_type == BranchCampusInfo.BRANCH and admin.admin_type == BranchCampusAdministratorInfo.CHANNEL_ADMIN:
              

                +        registers = UserCourseRegisterInfo.objects.filter(admin_id=admin.admin_id)
              

                     
              

                     if course_id:
              

                         registers = UserCourseRegisterInfo.objects.filter(course_id=course_id)
              

api/course_views.py

@@ -6,7 +6,7 @@ from django_query import get_query_value

                 from django_response import response
              

                 from paginator import pagination
              

                 
              

                -from registration.models import BranchCampusAdministratorInfo, CourseInfo, CourseRegisterFieldInfo, CourseRegisterInfo
              

                +from registration.models import BranchCampusAdministratorInfo, CourseInfo, CourseRegisterFieldInfo, CourseRegisterInfo, BranchCampusInfo
              

                 
              

                 
              

                 def add_course(request):
              
@@ -79,9 +79,10 @@ def get_course_list(request):

                         admin = BranchCampusAdministratorInfo.objects.get(admin_id=admin_id, user_status=BranchCampusAdministratorInfo.ACTIVATED)
              

                     except BranchCampusAdministratorInfo.DoesNotExist:
              

                         admin = None
              

                +    
              

                 
              

                     courses = CourseInfo.objects.filter(status=True)
              

                -    if admin:
              

                +    if admin and admin.data.get('campus_type', BranchCampusInfo.BRANCH) == BranchCampusInfo.BRANCH:
              

                         courses = courses.filter(authorities__contains=admin.campus_id)
              

                     count = courses.count()
              

                     courses, left = pagination(courses, page, num)
              

registration/admin.py

@@ -10,11 +10,11 @@ from registration.models import (BranchCampusAdministratorInfo, BranchCampusInfo

                 
              

                 
              

                 class BranchCampusInfoAdmin(admin.ModelAdmin):
              

                -    list_display = ('campus_id', 'campus_name', 'updated_at', 'created_at')
              

                +    list_display = ('campus_id', 'campus_name', 'status', 'updated_at', 'created_at')
              

                 
              

                 
              

                 class BranchCampusAdministratorInfoAdmin(admin.ModelAdmin):
              

                -    list_display = ('admin_id', 'campus_id', 'campus_name', 'name', 'phone', 'password', 'encryption', 'user_status', 'updated_at', 'created_at')
              

                +    list_display = ('admin_id', 'campus_id', 'campus_name', 'admin_type', 'name', 'phone', 'password', 'encryption', 'user_status', 'updated_at', 'created_at')
              

                 
              

                     def save_model(self, request, obj, form, change):
              

                         password = obj.password or obj.phone[-6:]
              

registration/migrations/0012_branchcampusadministratorinfo_admin_type.py

@@ -0,0 +1,18 @@

                +# Generated by Django 2.2.15 on 2021-11-03 09:18
              

                +
              

                +from django.db import migrations, models
              

                +
              

                +
              

                +class Migration(migrations.Migration):
              

                +
              

                +    dependencies = [
              

                +        ('registration', '0011_usercourseregisterinfo_user_status'),
              

                +    ]
              

                +
              

                +    operations = [
              

                +        migrations.AddField(
              

                +            model_name='branchcampusadministratorinfo',
              

                +            name='admin_type',
              

                +            field=models.IntegerField(choices=[(0, '超级管理员'), (1, '渠道管理员')], db_index=True, default=1, help_text='管理员类型', verbose_name='admin_type'),
              

                +        ),
              

                +    ]
              

registration/models.py

@@ -50,8 +50,17 @@ class BranchCampusAdministratorInfo(BaseModelMixin):

                         (DELETED, '已删除'),
              

                     )
              

                 
              

                +    SUPER_ADMIN = 0
              

                +    CHANNEL_ADMIN = 1
              

                +
              

                +    ADMIN_TYPE = (
              

                +        (SUPER_ADMIN, '超级管理员'),
              

                +        (CHANNEL_ADMIN, '渠道管理员'),
              

                +    )
              

                +
              

                     user_id = models.CharField(_('user_id'), max_length=32, blank=True, null=True, help_text='用户ID', db_index=True, unique=True)
              

                     admin_id = ShortUUIDField(_('admin_id'), max_length=32, blank=True, null=True, help_text='管理员唯一标识', db_index=True, unique=True)
              

                +    admin_type = models.IntegerField(_('admin_type'), choices=ADMIN_TYPE, default=CHANNEL_ADMIN, help_text='管理员类型', db_index=True)
              

                 
              

                     campus_id = models.CharField(_('campus_id'), max_length=32, blank=True, null=True, help_text='分院唯一标识', db_index=True)
              

                     campus_name = models.CharField(_('campus_name'), max_length=255, blank=True, null=True, help_text='分院名称')
              
@@ -77,6 +86,7 @@ class BranchCampusAdministratorInfo(BaseModelMixin):

                         return {
              

                             'user_id': self.user_id,
              

                             'admin_id': self.admin_id,
              

                +            'admin_type': self.admin_type,
              

                             'campus_id': self.campus_id,
              

                             'campus_name': self.campus_name,
              

                             'campus_type': admin.campus_type,