From 10bb13b13ec0199b2d6bff7838d06586bca77d09 Mon Sep 17 00:00:00 2001 From: jl-zhoujl2 Date: Tue, 9 May 2023 09:56:52 +0800 Subject: [PATCH] =?UTF-8?q?5.9=20=E9=AB=98=E8=B4=A8=E9=87=8F=E8=BF=90?= =?UTF-8?q?=E8=90=A5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/HighQualityOperation/Detail.tsx | 1 + .../Management/EventMaintenance/index.tsx | 25 +++++++++---------- src/pages/HighQualityOperation/utils.ts | 17 ++++++++++++- 3 files changed, 29 insertions(+), 14 deletions(-) diff --git a/src/pages/HighQualityOperation/Detail.tsx b/src/pages/HighQualityOperation/Detail.tsx index 23d0095..a4273d8 100644 --- a/src/pages/HighQualityOperation/Detail.tsx +++ b/src/pages/HighQualityOperation/Detail.tsx @@ -178,6 +178,7 @@ const Detail: React.FC = (props) => { ( diff --git a/src/pages/HighQualityOperation/Management/EventMaintenance/index.tsx b/src/pages/HighQualityOperation/Management/EventMaintenance/index.tsx index 69a0461..00e4693 100644 --- a/src/pages/HighQualityOperation/Management/EventMaintenance/index.tsx +++ b/src/pages/HighQualityOperation/Management/EventMaintenance/index.tsx @@ -6,10 +6,12 @@ import React, { useState } from 'react'; import { useRef } from 'react'; import EventMaintenanceModal from './components/EventMaintenanceModal'; import { changeEventStatus, deleteEvent, getEventList } from './service'; -import { managerAuthority } from '../../utils'; +import { authCheck, managerAuthority } from '../../utils'; const EventMaintenance: React.FC<{}> = () => { const actionRef = useRef(); + //权限校验 + const auth = useRef(authCheck(["ebtp-party-admin"])); //新建 编辑 查看 const [modalVisible, setModalVisible] = useState(false); //行数据 @@ -192,23 +194,20 @@ const EventMaintenance: React.FC<{}> = () => { actionRef={actionRef} loading={loading} request={async (params) => { - setLoading(true); - return await getEventList(params).then(res => { - if (res?.success) { + if (auth.current) { + setLoading(true); + return await getEventList(params).then(res => { return { data: res?.data.records, success: res?.success, total: res?.data.total }; - } - return { - data: [], - success: false, - total: 0, - }; - }).finally(() => { - setLoading(false); - }) + }).finally(() => { + setLoading(false); + }) + } else { + return {}; + } }} rowKey="id" options={false} diff --git a/src/pages/HighQualityOperation/utils.ts b/src/pages/HighQualityOperation/utils.ts index 9f9baeb..5e7039e 100644 --- a/src/pages/HighQualityOperation/utils.ts +++ b/src/pages/HighQualityOperation/utils.ts @@ -1,6 +1,7 @@ import { pictureDisplayPath } from "@/utils/DownloadUtils"; import { getSessionUserData } from "@/utils/session"; import moment from "moment"; +import { history } from 'umi'; /** * 图片路径拼接 * @param filePath 图片路径 @@ -96,4 +97,18 @@ export const formatCreateTime = (createTime: string) => { } else { return `${Math.floor(diff / (60 * 60 * 24 * 365))}年前`; } -}; \ No newline at end of file +}; +//角色校验 +export const authCheck = (authority: string[]) => { + //获取角色列表 + const authorityList: any[] | undefined = getSessionUserData()?.authorityList; + if (isEmpty(authorityList)) { + history.replace({ pathname: "/404" }); + return false; + } + if (authority.findIndex(item => authorityList?.findIndex(ite => ite.roleCode == item) != -1) == -1) {//角色权限校验 + history.replace({ pathname: "/401", query: { code: "405" } }); + return false; + } + return true; +} \ No newline at end of file