diff --git a/src/pages/configuration/subpage/DepartmentConfig.tsx b/src/pages/configuration/subpage/DepartmentConfig.tsx index e12fa89..b0a777b 100644 --- a/src/pages/configuration/subpage/DepartmentConfig.tsx +++ b/src/pages/configuration/subpage/DepartmentConfig.tsx @@ -34,10 +34,10 @@ class DepartmentConfig extends React.Component { } }) if (newRow) { - let data={ + let data = { departmentName: row.departmentName, departmentManagerId: row.departmentManagerId, - staffIds:[] + staffIds: [] } axiosInstance.post("management/department", data).then((res) => { this.update() @@ -45,11 +45,11 @@ class DepartmentConfig extends React.Component { this.update() }) } else { - let data={ + let data = { departmentName: row.departmentName, departmentManagerId: row.departmentManagerId, } - axiosInstance.put("management/department/"+row.departmentId, data).then((res) => { + axiosInstance.put("management/department/" + row.departmentId, data).then((res) => { this.update() }).catch((err) => { this.update() @@ -76,15 +76,16 @@ class DepartmentConfig extends React.Component { return [] } let res = [] + console.log(columns) for (let i = 0; i < columns.length; i++) { - console.log(columns[i].departmentName) - res.push({ - id: columns[i].departmentId, - departmentId: columns[i].departmentId, - departmentName: columns[i].departmentName, - departmentManagerId: columns[i].departmentManager.staffId, - departmentManagerName: columns[i].departmentManager.staffName, - }) + if (columns[i].deletedAt == null) + res.push({ + id: columns[i].departmentId, + departmentId: columns[i].departmentId, + departmentName: columns[i].departmentName, + departmentManagerId: columns[i].departmentManager.staffId, + departmentManagerName: columns[i].departmentManager.staffName, + }) } console.log(res); return res