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 @@