diff --git a/backend/dvadmin/system/views/login.py b/backend/dvadmin/system/views/login.py
index 35923cc..766a6c7 100644
--- a/backend/dvadmin/system/views/login.py
+++ b/backend/dvadmin/system/views/login.py
@@ -1,11 +1,9 @@
 import base64
 import hashlib
 from datetime import datetime, timedelta
-
 from captcha.views import CaptchaStore, captcha_image
 from django.contrib import auth
 from django.contrib.auth import login
-from django.contrib.auth.hashers import make_password, check_password
 from django.shortcuts import redirect
 from django.utils.translation import gettext_lazy as _
 from drf_yasg import openapi
@@ -14,9 +12,7 @@ from rest_framework import serializers
 from rest_framework.views import APIView
 from rest_framework_simplejwt.serializers import TokenObtainPairSerializer
 from rest_framework_simplejwt.views import TokenObtainPairView
-
 from django.conf import settings
-
 from application import dispatch
 from dvadmin.system.models import Users
 from dvadmin.utils.json_response import ErrorResponse, DetailResponse
@@ -58,6 +54,7 @@ class LoginSerializer(TokenObtainPairSerializer):
     captcha = serializers.CharField(
         max_length=6, required=False, allow_null=True, allow_blank=True
     )
+
     class Meta:
         model = Users
         fields = "__all__"
@@ -79,13 +76,18 @@ class LoginSerializer(TokenObtainPairSerializer):
                 raise CustomValidationError("验证码过期")
             else:
                 if self.image_code and (
-                        self.image_code.response == captcha
-                        or self.image_code.challenge == captcha
+                    self.image_code.response == captcha
+                    or self.image_code.challenge == captcha
                 ):
                     self.image_code and self.image_code.delete()
                 else:
                     self.image_code and self.image_code.delete()
                     raise CustomValidationError("图片验证码错误")
+
+        user = Users.objects.get(username=attrs['username'])
+        if not user.is_active:
+            raise CustomValidationError("账号被锁定")
+
         data = super().validate(attrs)
         data["name"] = self.user.name
         data["userId"] = self.user.id
@@ -107,6 +109,7 @@ class LoginSerializer(TokenObtainPairSerializer):
         save_login_log(request=request)
         return {"code": 2000, "msg": "请求成功", "data": data}
 
+
 class LoginView(TokenObtainPairView):
     """
     登录接口
diff --git a/web/src/views/system/user/crud.tsx b/web/src/views/system/user/crud.tsx
index deda080..c09ab52 100644
--- a/web/src/views/system/user/crud.tsx
+++ b/web/src/views/system/user/crud.tsx
@@ -1,15 +1,12 @@
 import * as api from './api';
-import { dict, PageQuery, AddReq, DelReq, EditReq, CrudExpose, CrudOptions, compute } from '@fast-crud/fast-crud';
+import { dict, UserPageQuery, AddReq, DelReq, EditReq, compute, CreateCrudOptionsProps, CreateCrudOptionsRet } from '@fast-crud/fast-crud';
 import { request } from '/@/utils/service';
 import { dictionary } from '/@/utils/dictionary';
 import { successMessage } from '/@/utils/message';
 import { inject } from 'vue';
-interface CreateCrudOptionsTypes {
-	crudOptions: CrudOptions;
-}
 
-export const createCrudOptions = function ({ crudExpose }: { crudExpose: CrudExpose }): CreateCrudOptionsTypes {
-	const pageRequest = async (query: PageQuery) => {
+export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOptionsRet {
+	const pageRequest = async (query: UserPageQuery) => {
 		return await api.GetList(query);
 	};
 	const editRequest = async ({ form, row }: EditReq) => {
diff --git a/web/src/views/system/user/index.vue b/web/src/views/system/user/index.vue
index c6fe04d..99e88e3 100644
--- a/web/src/views/system/user/index.vue
+++ b/web/src/views/system/user/index.vue
@@ -1,65 +1,64 @@
 <template>
-  <fs-page>
-    <el-row class="mx-2">
-      <el-col xs="24" :sm="8" :md="6" :lg="4" :xl="4" class="p-1">
-        <el-card :body-style="{ height: '100%' }">
-          <p class="font-mono font-black text-center text-xl pb-5">
-            部门列表
-            <el-tooltip effect="dark" :content="content" placement="right">
-              <el-icon>
-                <QuestionFilled/>
-              </el-icon>
-            </el-tooltip>
-          </p>
-          <el-input v-model="filterText" :placeholder="placeholder"/>
-          <el-tree
-              ref="treeRef"
-              class="font-mono font-bold leading-6 text-7xl"
-              :data="data"
-              :props="treeProps"
-              :filter-node-method="filterNode"
-              icon="ArrowRightBold"
-              :indent="12"
-              @node-click="onTreeNodeClick"
-          >
-            <template #default="{ node, data }">
-              <span class="text-center font-black text-xl">{{ node.label }}</span>
-            </template>
-          </el-tree>
-        </el-card>
-      </el-col>
-      <el-col xs="24" :sm="16" :md="18" :lg="20" :xl="20" class="p-1">
-        <el-card :body-style="{ height: '100%' }">
-
-          <fs-crud ref="crudRef" v-bind="crudBinding"></fs-crud>
-
-        </el-card>
-      </el-col>
-    </el-row>
-  </fs-page>
+	<fs-page>
+		<el-row class="mx-2">
+			<el-col xs="24" :sm="8" :md="6" :lg="4" :xl="4" class="p-1">
+				<el-card :body-style="{ height: '100%' }">
+					<p class="font-mono font-black text-center text-xl pb-5">
+						部门列表
+						<el-tooltip effect="dark" :content="content" placement="right">
+							<el-icon>
+								<QuestionFilled />
+							</el-icon>
+						</el-tooltip>
+					</p>
+					<el-input v-model="filterText" :placeholder="placeholder" />
+					<el-tree
+						ref="treeRef"
+						class="font-mono font-bold leading-6 text-7xl"
+						:data="data"
+						:props="treeProps"
+						:filter-node-method="filterNode"
+						icon="ArrowRightBold"
+						:indent="12"
+						@node-click="onTreeNodeClick"
+					>
+						<template #default="{ node, data }">
+							<span class="text-center font-black text-xl">{{ node.label }}</span>
+						</template>
+					</el-tree>
+				</el-card>
+			</el-col>
+			<el-col xs="24" :sm="16" :md="18" :lg="20" :xl="20" class="p-1">
+				<el-card :body-style="{ height: '100%' }">
+					<fs-crud ref="crudRef" v-bind="crudBinding"></fs-crud>
+				</el-card>
+			</el-col>
+		</el-row>
+	</fs-page>
 </template>
 
 <script lang="ts" setup>
-import {useExpose, useCrud} from '@fast-crud/fast-crud';
-import {createCrudOptions} from './crud';
+import { useExpose, useCrud } from '@fast-crud/fast-crud';
+import { createCrudOptions } from './crud';
 import * as api from './api';
-import {ElTree} from 'element-plus';
-import {ref, onMounted, watch, toRaw, defineAsyncComponent} from 'vue';
+import { ElTree } from 'element-plus';
+import { ref, onMounted, watch, toRaw, defineAsyncComponent } from 'vue';
 import XEUtils from 'xe-utils';
-import {errorMessage, successMessage} from '../../../utils/message';
-import {GetDept} from "./api";
+import { errorMessage, successMessage } from '../../../utils/message';
+import { GetDept } from './api';
+import { dictionary } from '/@/utils/dictionary';
 
 interface Tree {
-  id: number;
-  name: string;
-  status: boolean;
-  children?: Tree[];
+	id: number;
+	name: string;
+	status: boolean;
+	children?: Tree[];
 }
 
 interface APIResponseData {
-  code?: number;
-  data: [];
-  msg?: string;
+	code?: number;
+	data: [];
+	msg?: string;
 }
 
 // 引入组件
@@ -68,21 +67,20 @@ const filterText = ref('');
 const treeRef = ref<InstanceType<typeof ElTree>>();
 
 const treeProps = {
-  children: 'children',
-  label: 'name',
-  icon: 'icon'
+	children: 'children',
+	label: 'name',
+	icon: 'icon',
 };
 
 watch(filterText, (val) => {
-  treeRef.value!.filter(val);
+	treeRef.value!.filter(val);
 });
 
 const filterNode = (value: string, data: Tree) => {
-  if (!value) return true;
-  return toRaw(data).name.indexOf(value) !== -1;
+	if (!value) return true;
+	return toRaw(data).name.indexOf(value) !== -1;
 };
 
-
 let data = ref([]);
 
 const content = `
@@ -90,27 +88,26 @@ const content = `
 `;
 
 const getData = () => {
-  api.GetDept({}).then((ret: APIResponseData) => {
-    const responseData = ret.data;
-    const result = XEUtils.toArrayTree(responseData, {
-      parentKey: 'parent',
-      children: 'children',
-      strict: true
-    });
-    console.log(result)
-    data.value = result;
-  });
+	api.GetDept({}).then((ret: APIResponseData) => {
+		const responseData = ret.data;
+		const result = XEUtils.toArrayTree(responseData, {
+			parentKey: 'parent',
+			children: 'children',
+			strict: true,
+		});
+		data.value = result;
+	});
 };
 
 //树形点击事件
 const onTreeNodeClick = (node: any) => {
-  const {id} = node
-  crudExpose.doSearch({form: {dept: id}})
-}
+	const { id } = node;
+	crudExpose.doSearch({ form: { dept: id } });
+};
 
 // 页面打开后获取列表数据
 onMounted(() => {
-  getData();
+	getData();
 });
 
 // crud组件的ref
@@ -118,28 +115,28 @@ const crudRef = ref();
 // crud 配置的ref
 const crudBinding = ref();
 // 暴露的方法
-const {crudExpose} = useExpose({crudRef, crudBinding});
+const { crudExpose } = useExpose({ crudRef, crudBinding });
 // 你的crud配置
-const {crudOptions} = createCrudOptions({crudExpose});
+const { crudOptions } = createCrudOptions({ crudExpose });
 // 初始化crud配置
-const {resetCrudOptions} = useCrud({crudExpose, crudOptions});
+const { resetCrudOptions } = useCrud({ crudExpose, crudOptions });
 
 // 页面打开后获取列表数据
 onMounted(() => {
-  crudExpose.doRefresh();
+	crudExpose.doRefresh();
 });
 </script>
 
 <style lang="scss" scoped>
 .el-row {
-  height: 100%;
+	height: 100%;
 
-  .el-col {
-    height: 100%;
-  }
+	.el-col {
+		height: 100%;
+	}
 }
 
 .el-card {
-  height: 100%;
+	height: 100%;
 }
 </style>