diff --git a/backend/dev_sql.db b/backend/dev_sql.db
index 7181c1d6..2423d6f8 100644
Binary files a/backend/dev_sql.db and b/backend/dev_sql.db differ
diff --git a/frontend/src/views/system/dept/index.vue b/frontend/src/views/system/dept/index.vue
index 0981dcaf..e56ff1ad 100644
--- a/frontend/src/views/system/dept/index.vue
+++ b/frontend/src/views/system/dept/index.vue
@@ -14,8 +14,8 @@
- 启用
- 停用
+ 启用
+ 停用
@@ -374,8 +374,8 @@ const loadingData = () => {
if (queryState.name) {
params['name'] = queryState.name;
}
- if (queryState.available) {
- params['available'] = queryState.available === 1 ? true : false;
+ if (queryState.available !== null && queryState.available !== undefined) {
+ params['available'] = queryState.available;
}
getDeptList(params).then(response => {
diff --git a/frontend/src/views/system/dept/types.ts b/frontend/src/views/system/dept/types.ts
index 9ee4a46e..32aad129 100644
--- a/frontend/src/views/system/dept/types.ts
+++ b/frontend/src/views/system/dept/types.ts
@@ -1,6 +1,6 @@
export interface searchDataType {
name?: string
- available?: number
+ available?: boolean
}
export interface tableDataType {
diff --git a/frontend/src/views/system/dict/data.vue b/frontend/src/views/system/dict/data.vue
index da33f59d..d2bc7658 100644
--- a/frontend/src/views/system/dict/data.vue
+++ b/frontend/src/views/system/dict/data.vue
@@ -24,8 +24,8 @@
- 启用
- 停用
+ 启用
+ 停用
@@ -426,9 +426,9 @@ const loadingData = () => {
params['dict_type'] = Array.isArray(route.query.dict_type) ? route.query.dict_type[0] : route.query.dict_type
queryState.dict_type = Array.isArray(route.query.dict_type) ? route.query.dict_type[0] : route.query.dict_type
}
- if (queryState.available) {
- params['available'] = queryState.available == 1 ? true : false;
- }
+ if (queryState.available !== null && queryState.available !== undefined) {
+ params['available'] = queryState.available;
+ }
params['page_no'] = pagination.current
params['page_size'] = pagination.pageSize
diff --git a/frontend/src/views/system/dict/index.vue b/frontend/src/views/system/dict/index.vue
index 3c761848..5e8e2c32 100644
--- a/frontend/src/views/system/dict/index.vue
+++ b/frontend/src/views/system/dict/index.vue
@@ -21,8 +21,8 @@
- 启用
- 停用
+ 启用
+ 停用
@@ -294,8 +294,8 @@ const loadingData = () => {
if (queryState.dict_type) {
params['dict_type'] = queryState.dict_type
}
- if (queryState.available) {
- params['available'] = queryState.available == 1 ? true : false;
+ if (queryState.available !== null && queryState.available !== undefined) {
+ params['available'] = queryState.available;
}
params['page_no'] = pagination.current
params['page_size'] = pagination.pageSize
diff --git a/frontend/src/views/system/dict/types.ts b/frontend/src/views/system/dict/types.ts
index 740a6e47..e508d686 100644
--- a/frontend/src/views/system/dict/types.ts
+++ b/frontend/src/views/system/dict/types.ts
@@ -1,13 +1,13 @@
export interface searchDataType {
dict_name?: string
dict_type?: string
- available?: number
+ available?: boolean;
}
export interface searchDictDataType {
dict_label?: string
dict_type?: string
- available?: number
+ available?: boolean;
}
export interface tableDictType {
diff --git a/frontend/src/views/system/job/index.vue b/frontend/src/views/system/job/index.vue
index ad4c77d1..3b6162c6 100644
--- a/frontend/src/views/system/job/index.vue
+++ b/frontend/src/views/system/job/index.vue
@@ -14,8 +14,8 @@
- 启用
- 停用
+ 启用
+ 停用
@@ -88,7 +88,7 @@
+ :text="record.coalesce ? '是' : '否'" />
@@ -321,10 +321,10 @@
-
+
- 启用
- 停用
+ 是
+ 否
{
params['start_time'] = `${queryState.date_range[0]} 00:00:00`;
params['end_time'] = `${queryState.date_range[1]} 23:59:59`;
}
- if (queryState.status) {
- params['status'] = queryState.status == 1 ? true : false;
+ if (queryState.status !== null && queryState.status !== undefined) {
+ params['status'] = queryState.status;
}
params['page_no'] = pagination.current
params['page_size'] = pagination.pageSize
diff --git a/frontend/src/views/system/job/types.ts b/frontend/src/views/system/job/types.ts
index 88fc898b..d9389141 100644
--- a/frontend/src/views/system/job/types.ts
+++ b/frontend/src/views/system/job/types.ts
@@ -1,6 +1,6 @@
export interface searchType {
name?: string
- status?: number
+ status?: boolean
date_range?: [string, string];
}
diff --git a/frontend/src/views/system/log/SelectorModal.vue b/frontend/src/views/system/log/SelectorModal.vue
index 62fe3e8f..9d1ac8ac 100644
--- a/frontend/src/views/system/log/SelectorModal.vue
+++ b/frontend/src/views/system/log/SelectorModal.vue
@@ -108,9 +108,9 @@ const loadingData = () => {
if (queryState.name) {
params['name'] = queryState.name
}
- if (queryState.available) {
- params['available'] = queryState.available == "true" ? true : false;
- }
+ if (queryState.available !== null && queryState.available !== undefined) {
+ params['available'] = queryState.available;
+ }
params['page_no'] = pagination.current
params['page_size'] = pagination.pageSize
@@ -135,7 +135,7 @@ const resetFields = () => {
Object.keys(queryState).forEach((key: string) => {
delete queryState[key];
});
- queryState.available = "true"
+ queryState.available = true;
pagination.current = 1;
loadingData();
}
@@ -179,7 +179,7 @@ const handleModalCancel = () => {
Object.keys(queryState).forEach((key: string) => {
delete queryState[key];
});
- queryState.available = "true"
+ queryState.available = true;
pagination.current = 1;
pagination.pageSize = pagination.defaultPageSize;
selectedRowKeys.value = [];
diff --git a/frontend/src/views/system/log/types.ts b/frontend/src/views/system/log/types.ts
index 342138ed..6e2526f3 100644
--- a/frontend/src/views/system/log/types.ts
+++ b/frontend/src/views/system/log/types.ts
@@ -24,7 +24,7 @@ export interface tableDataType {
export interface searchCreatorDataType {
name?: string;
- available?: string;
+ available?: boolean;
}
export interface creatorType {
diff --git a/frontend/src/views/system/menu/index.vue b/frontend/src/views/system/menu/index.vue
index 3b2c9e4c..0d8ba3d2 100644
--- a/frontend/src/views/system/menu/index.vue
+++ b/frontend/src/views/system/menu/index.vue
@@ -14,8 +14,8 @@
- 启用
- 停用
+ 启用
+ 停用
@@ -525,8 +525,8 @@ const loadingData = () => {
if (queryState.name) {
params['name'] = queryState.name
}
- if (queryState.available) {
- params['available'] = queryState.available == 1 ? true : false;
+ if (queryState.available !== null && queryState.available !== undefined) {
+ params['available'] = queryState.available;
}
getMenuList(params).then(response => {
diff --git a/frontend/src/views/system/menu/types.ts b/frontend/src/views/system/menu/types.ts
index 1b94165b..8fb1e56c 100644
--- a/frontend/src/views/system/menu/types.ts
+++ b/frontend/src/views/system/menu/types.ts
@@ -1,6 +1,6 @@
export interface searchDataType {
name?: string
- available?: number
+ available?: boolean;
}
export interface tableDataType {
diff --git a/frontend/src/views/system/notice/index.vue b/frontend/src/views/system/notice/index.vue
index 73649e42..134023c7 100644
--- a/frontend/src/views/system/notice/index.vue
+++ b/frontend/src/views/system/notice/index.vue
@@ -15,8 +15,8 @@
- 启用
- 停用
+ 启用
+ 停用
@@ -341,8 +341,8 @@ const loadingData = () => {
if (queryState.notice_title) {
params['notice_title'] = queryState.notice_title
}
- if (queryState.available) {
- params['available'] = queryState.available == 1 ? true : false;
+ if (queryState.available !== null && queryState.available !== undefined) {
+ params['available'] = queryState.available;
}
params['page_no'] = pagination.current
params['page_size'] = pagination.pageSize
diff --git a/frontend/src/views/system/notice/types.ts b/frontend/src/views/system/notice/types.ts
index f556e574..b0d63ca9 100644
--- a/frontend/src/views/system/notice/types.ts
+++ b/frontend/src/views/system/notice/types.ts
@@ -1,6 +1,6 @@
export interface searchDataType {
notice_title?: string
- available?: number
+ available?: boolean;
}
export interface tableDataType {
diff --git a/frontend/src/views/system/position/index.vue b/frontend/src/views/system/position/index.vue
index 9f966ced..ced14b3c 100644
--- a/frontend/src/views/system/position/index.vue
+++ b/frontend/src/views/system/position/index.vue
@@ -14,8 +14,8 @@
- 启用
- 停用
+ 启用
+ 停用
@@ -295,8 +295,8 @@ const loadingData = () => {
if (queryState.name) {
params['name'] = queryState.name
}
- if (queryState.available) {
- params['available'] = queryState.available == true ? true : false;
+ if (queryState.available !== null && queryState.available !== undefined) {
+ params['available'] = queryState.available;
}
params['page_no'] = pagination.current
params['page_size'] = pagination.pageSize
diff --git a/frontend/src/views/system/role/index.vue b/frontend/src/views/system/role/index.vue
index 83fa1418..84fd85e1 100644
--- a/frontend/src/views/system/role/index.vue
+++ b/frontend/src/views/system/role/index.vue
@@ -14,8 +14,8 @@
- 启用
- 停用
+ 启用
+ 停用
@@ -328,8 +328,8 @@ const loadingData = () => {
if (queryState.name) {
params['name'] = queryState.name
}
- if (queryState.available) {
- params['available'] = queryState.available == 1 ? true : false;
+ if (queryState.available !== null && queryState.available !== undefined) {
+ params['available'] = queryState.available;
}
params['page_no'] = pagination.current
params['page_size'] = pagination.pageSize
diff --git a/frontend/src/views/system/role/types.ts b/frontend/src/views/system/role/types.ts
index fa6ac376..fedc0c51 100644
--- a/frontend/src/views/system/role/types.ts
+++ b/frontend/src/views/system/role/types.ts
@@ -1,6 +1,6 @@
export interface searchDataType {
name?: string
- available?: number
+ available?: boolean;
}
export interface tableDataType {
diff --git a/frontend/src/views/system/user/SelectorModal.vue b/frontend/src/views/system/user/SelectorModal.vue
index ec2e8d56..af432472 100644
--- a/frontend/src/views/system/user/SelectorModal.vue
+++ b/frontend/src/views/system/user/SelectorModal.vue
@@ -17,8 +17,8 @@
- 启用
- 停用
+ 启用
+ 停用
@@ -130,8 +130,8 @@ const loadingData = () => {
if (queryState.name) {
params['name'] = queryState.name
}
- if (queryState.available) {
- params['available'] = queryState.available == "true" ? true : false;
+ if (queryState.available !== null && queryState.available !== undefined) {
+ params['available'] = queryState.available;
}
params['page_no'] = pagination.current
params['page_size'] = pagination.pageSize
diff --git a/frontend/src/views/system/user/index.vue b/frontend/src/views/system/user/index.vue
index 35478e67..3df65044 100644
--- a/frontend/src/views/system/user/index.vue
+++ b/frontend/src/views/system/user/index.vue
@@ -19,8 +19,8 @@
- 启用
- 停用
+ 启用
+ 停用
@@ -558,8 +558,8 @@ const loadingData = () => {
if (queryState.name) {
params['name'] = queryState.name
}
- if (queryState.available) {
- params['available'] = queryState.available == 1 ? true : false;
+ if (queryState.available !== null && queryState.available !== undefined) {
+ params['available'] = queryState.available;
}
if (queryState.dept_id) {
params['dept_id'] = queryState.dept_id; // 添加 dept_id 参数
diff --git a/frontend/src/views/system/user/types.ts b/frontend/src/views/system/user/types.ts
index 18cd2342..441a0979 100644
--- a/frontend/src/views/system/user/types.ts
+++ b/frontend/src/views/system/user/types.ts
@@ -1,7 +1,7 @@
export interface searchDataType {
username?: string
name?: string
- available?: number
+ available?: boolean;
dept_id?: number;
}