1.0.1 修复软件控制权限

This commit is contained in:
lq1405 2025-01-12 15:31:58 +08:00
parent 8b1ccfed47
commit 6512858af4
3 changed files with 6 additions and 4 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "ant-design-pro", "name": "lms",
"version": "6.0.0", "version": "1.0.1",
"private": true, "private": true,
"description": "An out-of-box UI solution for enterprise applications", "description": "An out-of-box UI solution for enterprise applications",
"scripts": { "scripts": {

View File

@ -227,6 +227,7 @@ const SoftwareControlManagement: FC<SoftwareControlManagementProps> = () => {
async function QueryUserSoftwareControlCollection(tableParams: TableModel.TableParams, options?: SoftwareModel.SoftwareControlQueryParams) { async function QueryUserSoftwareControlCollection(tableParams: TableModel.TableParams, options?: SoftwareModel.SoftwareControlQueryParams) {
try { try {
debugger
setLoading(true); setLoading(true);
let res = await SoftwareControl.GetUserSoftwareControlCollection(tableParams, options ?? {}); let res = await SoftwareControl.GetUserSoftwareControlCollection(tableParams, options ?? {});
setData(res.collection); setData(res.collection);
@ -275,7 +276,7 @@ const SoftwareControlManagement: FC<SoftwareControlManagementProps> = () => {
async function QuerySoftwareControlByCondition(values: any) { async function QuerySoftwareControlByCondition(values: any) {
await QueryUserSoftwareControlCollection(values); await QueryUserSoftwareControlCollection(tableParams, values);
} }
return ( return (
@ -291,7 +292,7 @@ const SoftwareControlManagement: FC<SoftwareControlManagementProps> = () => {
<Form.Item label="软件" name='softwareId' style={{ marginBottom: 5 }}> <Form.Item label="软件" name='softwareId' style={{ marginBottom: 5 }}>
<Select placeholder="请选择用户名称" style={{ width: 200 }} options={softwareOptions} /> <Select placeholder="请选择用户名称" style={{ width: 200 }} options={softwareOptions} />
</Form.Item> </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 }]} /> <Select placeholder="请选择是否永久" style={{ width: 200 }} options={[{ label: "是", value: true }, { label: "否", value: false }]} />
</Form.Item> </Form.Item>
<Form.Item label="备注" name='remark' style={{ marginBottom: 5 }}> <Form.Item label="备注" name='remark' style={{ marginBottom: 5 }}>

View File

@ -39,6 +39,7 @@ async function ApplyUserSoftwareControl(userId: number) {
* @returns * @returns
*/ */
async function GetUserSoftwareControlCollection(tableParams: TableModel.TableParams, queryParams: SoftwareModel.SoftwareControlQueryParams) { async function GetUserSoftwareControlCollection(tableParams: TableModel.TableParams, queryParams: SoftwareModel.SoftwareControlQueryParams) {
debugger
let data = { let data = {
...queryParams, ...queryParams,
page: tableParams.pagination?.current, page: tableParams.pagination?.current,