diff --git a/src/modules/smart-system/views/function/FunctionListView.config.ts b/src/modules/smart-system/views/function/FunctionListView.config.ts index c8fa9eec7..8516383c3 100644 --- a/src/modules/smart-system/views/function/FunctionListView.config.ts +++ b/src/modules/smart-system/views/function/FunctionListView.config.ts @@ -64,14 +64,8 @@ export const tableColumns: SmartColumn[] = [ }, { title: '{common.table.createUser}', - field: 'createUserId', + field: 'createBy', width: 120, - formatter: ({ row }: any) => { - if (row.createUser) { - return row.createUser.fullName; - } - return ''; - }, }, { title: '{common.table.updateTime}', @@ -81,14 +75,8 @@ export const tableColumns: SmartColumn[] = [ }, { title: '{common.table.updateUser}', - field: 'updateUserId', + field: 'updateBy', width: 120, - formatter: ({ row }: any) => { - if (row.updateUser) { - return row.updateUser.fullName; - } - return ''; - }, }, { title: '{common.table.operation}', diff --git a/src/modules/smart-system/views/i18n/components/i18n.config.ts b/src/modules/smart-system/views/i18n/components/i18n.config.ts index 9873f1130..0809f8c37 100644 --- a/src/modules/smart-system/views/i18n/components/i18n.config.ts +++ b/src/modules/smart-system/views/i18n/components/i18n.config.ts @@ -32,7 +32,7 @@ export const getI18nTableColumns = (): SmartColumn[] => { width: 160, }, { - field: 'createUser', + field: 'createBy', title: '{common.table.createUser}', width: 120, }, @@ -42,7 +42,7 @@ export const getI18nTableColumns = (): SmartColumn[] => { width: 160, }, { - field: 'updateUser', + field: 'updateBy', title: '{common.table.updateUser}', width: 120, }, diff --git a/src/modules/smart-system/views/role/RoleListView.config.ts b/src/modules/smart-system/views/role/RoleListView.config.ts index 80fade824..580aff2d5 100644 --- a/src/modules/smart-system/views/role/RoleListView.config.ts +++ b/src/modules/smart-system/views/role/RoleListView.config.ts @@ -56,14 +56,8 @@ export const getTableColumns = (): SmartColumn[] => { }, { title: '{common.table.createUser}', - field: 'createUserId', + field: 'createBy', width: 120, - formatter: ({ row }: any) => { - if (row.createUser) { - return row.createUser.fullName; - } - return ''; - }, }, { title: '{common.table.updateTime}', @@ -73,14 +67,8 @@ export const getTableColumns = (): SmartColumn[] => { }, { title: '{common.table.updateUser}', - field: 'updateUserId', + field: 'updateBy', width: 120, - formatter: ({ row }: any) => { - if (row.updateUser) { - return row.updateUser.fullName; - } - return ''; - }, }, { title: '{common.table.operation}', diff --git a/src/modules/smart-system/views/user/UserListView.config.ts b/src/modules/smart-system/views/user/UserListView.config.ts index 6f1abb625..d60071f90 100644 --- a/src/modules/smart-system/views/user/UserListView.config.ts +++ b/src/modules/smart-system/views/user/UserListView.config.ts @@ -76,14 +76,8 @@ export const getTableColumns = (): SmartColumn[] => { }, { title: '{common.table.createUser}', - field: 'createUserId', + field: 'createBy', width: 120, - formatter: ({ row }: any) => { - if (row.createUser) { - return row.createUser.fullName; - } - return ''; - }, }, { title: '{common.table.updateTime}', @@ -93,14 +87,8 @@ export const getTableColumns = (): SmartColumn[] => { }, { title: '{common.table.updateUser}', - field: 'updateUserId', + field: 'updateBy', width: 120, - formatter: ({ row }: any) => { - if (row.updateUser) { - return row.updateUser.fullName; - } - return ''; - }, }, { title: '{common.table.operation}', diff --git a/src/modules/smart-system/views/userGroup/UserGroupListView.config.ts b/src/modules/smart-system/views/userGroup/UserGroupListView.config.ts index ee7b0a0dd..ce2e891ae 100644 --- a/src/modules/smart-system/views/userGroup/UserGroupListView.config.ts +++ b/src/modules/smart-system/views/userGroup/UserGroupListView.config.ts @@ -45,14 +45,8 @@ export const getTableColumns = (): SmartColumn[] => { }, { title: '{common.table.createUser}', - field: 'createUserId', + field: 'createBy', width: 120, - formatter: ({ row }: any) => { - if (row.createUser) { - return row.createUser.fullName; - } - return ''; - }, }, { title: '{common.table.updateTime}', @@ -62,14 +56,8 @@ export const getTableColumns = (): SmartColumn[] => { }, { title: '{common.table.updateUser}', - field: 'updateUserId', + field: 'updateBy', width: 120, - formatter: ({ row }: any) => { - if (row.updateUser) { - return row.updateUser.fullName; - } - return ''; - }, }, { title: '{common.table.operation}',