From 6512858af4a09232c7ed5c94a248663f612f398c Mon Sep 17 00:00:00 2001
From: lq1405 <2769838458@qq.com>
Date: Sun, 12 Jan 2025 15:31:58 +0800
Subject: [PATCH] =?UTF-8?q?1.0.1=20=E4=BF=AE=E5=A4=8D=E8=BD=AF=E4=BB=B6?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                                 | 4 ++--
 .../Software/SofrwareControl/SofrwareControlManagement.tsx   | 5 +++--
 src/services/services/software.ts                            | 1 +
 3 files changed, 6 insertions(+), 4 deletions(-)

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<SoftwareControlManagementProps> = () => {
 
   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<SoftwareControlManagementProps> = () => {
 
 
   async function QuerySoftwareControlByCondition(values: any) {
-    await QueryUserSoftwareControlCollection(values);
+    await QueryUserSoftwareControlCollection(tableParams, values);
   }
 
   return (
@@ -291,7 +292,7 @@ const SoftwareControlManagement: FC<SoftwareControlManagementProps> = () => {
         <Form.Item label="软件" name='softwareId' style={{ marginBottom: 5 }}>
           <Select placeholder="请选择用户名称" style={{ width: 200 }} options={softwareOptions} />
         </Form.Item>
-        <Form.Item label="是否永久" name='IsForever' style={{ marginBottom: 5 }}>
+        <Form.Item label="是否永久" name='isForever' style={{ marginBottom: 5 }}>
           <Select placeholder="请选择是否永久" style={{ width: 200 }} options={[{ label: "是", value: true }, { label: "否", value: false }]} />
         </Form.Item>
         <Form.Item label="备注" name='remark' style={{ marginBottom: 5 }}>
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,