diff --git a/package.json b/package.json index 01e86b1..c3c41ee 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { - "name": "ant-design-pro", - "version": "6.0.0", + "name": "lms", + "version": "1.0.1", "private": true, "description": "An out-of-box UI solution for enterprise applications", "scripts": { diff --git a/src/pages/Software/SofrwareControl/SofrwareControlManagement.tsx b/src/pages/Software/SofrwareControl/SofrwareControlManagement.tsx index aa22d22..e8914c1 100644 --- a/src/pages/Software/SofrwareControl/SofrwareControlManagement.tsx +++ b/src/pages/Software/SofrwareControl/SofrwareControlManagement.tsx @@ -227,6 +227,7 @@ const SoftwareControlManagement: FC = () => { async function QueryUserSoftwareControlCollection(tableParams: TableModel.TableParams, options?: SoftwareModel.SoftwareControlQueryParams) { try { + debugger setLoading(true); let res = await SoftwareControl.GetUserSoftwareControlCollection(tableParams, options ?? {}); setData(res.collection); @@ -275,7 +276,7 @@ const SoftwareControlManagement: FC = () => { async function QuerySoftwareControlByCondition(values: any) { - await QueryUserSoftwareControlCollection(values); + await QueryUserSoftwareControlCollection(tableParams, values); } return ( @@ -291,7 +292,7 @@ const SoftwareControlManagement: FC = () => { diff --git a/src/services/services/software.ts b/src/services/services/software.ts index 089d27e..5e0b85b 100644 --- a/src/services/services/software.ts +++ b/src/services/services/software.ts @@ -39,6 +39,7 @@ async function ApplyUserSoftwareControl(userId: number) { * @returns */ async function GetUserSoftwareControlCollection(tableParams: TableModel.TableParams, queryParams: SoftwareModel.SoftwareControlQueryParams) { + debugger let data = { ...queryParams, page: tableParams.pagination?.current,