From 5e1e5a8cb4bf2e5abc3356727288373a55655944 Mon Sep 17 00:00:00 2001
From: "peng.peng" <peng.peng@free-sun.com.cn>
Date: Fri, 3 Nov 2023 09:38:50 +0800
Subject: [PATCH 1/4] =?UTF-8?q?(*)=E8=B5=84=E6=BA=90=E6=A3=80=E7=B4=A2?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/app/lib/controllers/auth/index.js         |  1 +
 .../lib/controllers/metadataSearch/index.js   | 19 ++++++++++++++++---
 api/app/lib/index.js                          |  3 ++-
 .../resourceRetrieval/containers/retrieval.js | 16 ++++++++++------
 4 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/api/app/lib/controllers/auth/index.js b/api/app/lib/controllers/auth/index.js
index ac242fd..1727601 100644
--- a/api/app/lib/controllers/auth/index.js
+++ b/api/app/lib/controllers/auth/index.js
@@ -56,6 +56,7 @@ async function login(ctx, next) {
         // await transaction.commit();
     } catch (error) {
         // await transaction.rollback();
+        ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`);
         ctx.status = 400;
         ctx.body = {
             message: typeof error == 'string' ? error : '登录失败'
diff --git a/api/app/lib/controllers/metadataSearch/index.js b/api/app/lib/controllers/metadataSearch/index.js
index 9832f1d..edebd92 100644
--- a/api/app/lib/controllers/metadataSearch/index.js
+++ b/api/app/lib/controllers/metadataSearch/index.js
@@ -15,6 +15,14 @@ function searchMeta(opts) {
                 where['$or'] = [{ name: { $iLike: `%${keywords}%` } }
                 ]
             }
+            const resourceCatalogOrganization = {
+                model: models.ResourceCatalog,
+                attributes: ['id', 'name'],
+                include: [{
+                    model: models.Organization,
+                    attributes: ['id', 'name'],
+                }]
+            }
             const findObj = {
                 include: [
                     {
@@ -22,7 +30,9 @@ function searchMeta(opts) {
                         include: [{
                             model: models.Tag,
                         }]
-                    }],
+                    },
+                    resourceCatalogOrganization
+                ],
                 where: {
                     ...where,
                     type: { $in: ['表', '库'] }
@@ -35,7 +45,9 @@ function searchMeta(opts) {
                         include: [{
                             model: models.Tag,
                         }]
-                    }],
+                    },
+                    resourceCatalogOrganization
+                ],
                 where: where
             }
             const findObj3 = {
@@ -45,7 +57,8 @@ function searchMeta(opts) {
                         include: [{
                             model: models.Tag,
                         }]
-                    }],
+                    },
+                ],
                 where: where
             }
 
diff --git a/api/app/lib/index.js b/api/app/lib/index.js
index 9c0f409..14424bc 100644
--- a/api/app/lib/index.js
+++ b/api/app/lib/index.js
@@ -110,6 +110,7 @@ module.exports.models = function (dc) {
 
    MetadataDatabase.belongsTo(ResourceCatalog, { foreignKey: 'catalog', targetKey: 'id' });
    RestfulApi.belongsTo(ResourceCatalog, { foreignKey: 'catalog', targetKey: 'id' });
-
+   MetadataFile.belongsTo(ResourceCatalog, { foreignKey: 'catalog', targetKey: 'id' });
+   
    ResourceCatalog.belongsTo(Organization, { foreignKey: 'orgId', targetKey: 'id' });
 };
diff --git a/web/client/src/sections/resourceRetrieval/containers/retrieval.js b/web/client/src/sections/resourceRetrieval/containers/retrieval.js
index 9f99eed..38f7846 100644
--- a/web/client/src/sections/resourceRetrieval/containers/retrieval.js
+++ b/web/client/src/sections/resourceRetrieval/containers/retrieval.js
@@ -201,15 +201,19 @@ function Retrieval(props) {
                     </div>
                     <div className='column2'>相关操作：<a onClick={() => { window.open(`/metadataManagement/latestMetadata?type=${METADTA_TYPE[s.type]}&treeId=${s?.catalog}&resourceId=${s.id}&catalogKey=${s.catalogKey}`) }}>定位</a>
                         {s?.type == '表' || s?.type == '文件' ?
-                            user?.role == '数据消费者' ?
+                            user?.username !== 'SuperAmin' ?
                                 <a onClick={() => {
-                                    const token = approveList?.rows?.find(x => x.resourceId == s.id)?.token
-                                    if (!token) {
-                                        message.warning('您暂未申请该数据资源，请先申请该数据资源')
+                                    const isOrgAdmin = user?.role == '系统管理员' && user?.orgId == s?.resourceCatalog?.organization?.id
+                                    if (isOrgAdmin) {
+                                        downloadData(s)
                                     } else {
-                                        setCurrentData(s)
+                                        const token = approveList?.rows?.find(x => x.resourceId == s.id)?.token
+                                        if (!token) {
+                                            message.warning('您暂未申请该数据资源，请先申请该数据资源')
+                                        } else {
+                                            setCurrentData(s)
+                                        }
                                     }
-
                                 }}>下载</a> :
                                 <a onClick={() => { downloadData(s) }}>下载</a> : ''}
                     </div>

From d06aafc28045b635239a2a4bd08ea142972bf3e3 Mon Sep 17 00:00:00 2001
From: "peng.peng" <peng.peng@free-sun.com.cn>
Date: Fri, 3 Nov 2023 09:53:53 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=EF=BC=88*=EF=BC=89=E6=9C=BA=E6=9E=84?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E6=A8=A1=E5=9D=97=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/client/src/sections/backups/nav-item.js             | 2 +-
 web/client/src/sections/memberManagement/nav-item.js    | 2 +-
 web/client/src/sections/metadataAcquisition/nav-item.js | 2 +-
 web/client/src/sections/metadataManagement/nav-item.js  | 8 ++++----
 web/client/src/sections/organization/nav-item.js        | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/web/client/src/sections/backups/nav-item.js b/web/client/src/sections/backups/nav-item.js
index 0b80f0a..fc6b81c 100644
--- a/web/client/src/sections/backups/nav-item.js
+++ b/web/client/src/sections/backups/nav-item.js
@@ -7,7 +7,7 @@ const SubMenu = Menu.SubMenu;
 export function getNavItem(user) {
 
     return (
-        user?.role == '系统管理员' && <SubMenu key="数据备份恢复" icon={<ControlOutlined />} title='数据备份恢复'>
+        user?.username == 'SuperAdmin' && <SubMenu key="数据备份恢复" icon={<ControlOutlined />} title='数据备份恢复'>
             <Menu.Item key="backups">
                 <Link to="/backups/restore">备份恢复</Link>
             </Menu.Item>
diff --git a/web/client/src/sections/memberManagement/nav-item.js b/web/client/src/sections/memberManagement/nav-item.js
index 56c3fd0..baa19f7 100644
--- a/web/client/src/sections/memberManagement/nav-item.js
+++ b/web/client/src/sections/memberManagement/nav-item.js
@@ -7,7 +7,7 @@ const SubMenu = Menu.SubMenu;
 export function getNavItem(user) {
 
     return (
-        user?.role == '系统管理员' && <Menu.Item icon={<UserOutlined />} key="auth">
+        user?.username == 'SuperAdmin' && <Menu.Item icon={<UserOutlined />} key="auth">
             <Link to="/memberManagement/auth">用户管理</Link>
         </Menu.Item>
         // user?.role == '系统管理员' && <SubMenu key="memberManagement" icon={<UserOutlined />} title='用户管理'>
diff --git a/web/client/src/sections/metadataAcquisition/nav-item.js b/web/client/src/sections/metadataAcquisition/nav-item.js
index 1d9a4a9..d30281b 100644
--- a/web/client/src/sections/metadataAcquisition/nav-item.js
+++ b/web/client/src/sections/metadataAcquisition/nav-item.js
@@ -6,7 +6,7 @@ const SubMenu = Menu.SubMenu;
 
 export function getNavItem(user) {
     return (
-        user?.role == '系统管理员' && <SubMenu key="metadataAcquisition" icon={<BarChartOutlined />} title='元数据采集'>
+        user?.username == 'SuperAdmin' && <SubMenu key="metadataAcquisition" icon={<BarChartOutlined />} title='元数据采集'>
             <Menu.Item key="Adapter">
                 <Link to="/metadataAcquisition/Adapter">适配器管理</Link>
             </Menu.Item>
diff --git a/web/client/src/sections/metadataManagement/nav-item.js b/web/client/src/sections/metadataManagement/nav-item.js
index 7189721..f399c2c 100644
--- a/web/client/src/sections/metadataManagement/nav-item.js
+++ b/web/client/src/sections/metadataManagement/nav-item.js
@@ -15,12 +15,12 @@ export function getNavItem(user) {
                     <Menu.Item key="businessMetadata">
                         <Link to="/metadataManagement/businessMetadata">业务元数据管理</Link>
                     </Menu.Item>
-                    <Menu.Item key="metaModelManagement">
+                    {user?.username == 'SuperAdmin' && <> <Menu.Item key="metaModelManagement">
                         <Link to="/metadataManagement/metaModelManagement">模型管理</Link>
                     </Menu.Item>
-                    <Menu.Item key="tagManagement">
-                        <Link to="/metadataManagement/tagManagement">标签管理</Link>
-                    </Menu.Item>
+                        <Menu.Item key="tagManagement">
+                            <Link to="/metadataManagement/tagManagement">标签管理</Link>
+                        </Menu.Item></>}
                 </>
             }
 
diff --git a/web/client/src/sections/organization/nav-item.js b/web/client/src/sections/organization/nav-item.js
index 8bebc92..0514371 100644
--- a/web/client/src/sections/organization/nav-item.js
+++ b/web/client/src/sections/organization/nav-item.js
@@ -7,7 +7,7 @@ const SubMenu = Menu.SubMenu;
 export function getNavItem(user) {
 
     return (
-        user?.role == '系统管理员' && <Menu.Item icon={<UserOutlined />} key="organization">
+        user?.username == 'SuperAdmin' && <Menu.Item icon={<UserOutlined />} key="organization">
             <Link to="/organization">机构管理</Link>
         </Menu.Item>
         // user?.role == '系统管理员' && <SubMenu key="memberManagement" icon={<UserOutlined />} title='用户管理'>

From 200ae4a458b7f58aeb39c0c28c67106da953cafb Mon Sep 17 00:00:00 2001
From: liujiangyong <liu.jiangyong@free-sun.com.cn>
Date: Fri, 3 Nov 2023 13:48:25 +0800
Subject: [PATCH 3/4] =?UTF-8?q?(*)=20=E6=9C=80=E6=96=B0=E5=85=83=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=9D=83=E9=99=90=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../containers/databasesTable.js              | 11 ++--
 .../containers/filesTable.js                  |  8 +--
 .../containers/latestMetadata.js              | 60 +++++++++++--------
 .../containers/metadataDetails.js             |  4 +-
 .../containers/metadataTab.js                 |  8 +--
 .../containers/restapisTable.js               |  8 +--
 6 files changed, 55 insertions(+), 44 deletions(-)

diff --git a/web/client/src/sections/metadataManagement/containers/databasesTable.js b/web/client/src/sections/metadataManagement/containers/databasesTable.js
index 8f3b569..2099041 100644
--- a/web/client/src/sections/metadataManagement/containers/databasesTable.js
+++ b/web/client/src/sections/metadataManagement/containers/databasesTable.js
@@ -11,7 +11,7 @@ import MetadataResourceModal from '../components/metadataResourceModal';
 import ReleaseModal from '../components/releaseModal';
 
 const DatabaseTable = (props) => {
-   const { user, dispatch, actions, clientHeight, resourceCatalogId, resourceCatalogKey,
+   const { user, dispatch, actions, clientHeight, resourceCatalogId, resourceCatalogKey, isAdmin,
       resourceCatalogPath, isRequesting, metadataModels, setView, tagList, metadataResourceApplications, params } = props;
    const { metadataManagement } = actions;
    const SortValues = { 'ascend': 'asc', 'descend': 'desc' };
@@ -182,7 +182,7 @@ const DatabaseTable = (props) => {
                ra.applyBy == user.id && ra.resourceName === record.name && ra.resourceId == record.id);
             return <ButtonGroup>
                <a onClick={() => onView(record)}>查看</a>
-               {user.role == '数据消费者' ? null :
+               {!isAdmin ? null :
                   <>
                      <a style={{ marginLeft: 10 }} onClick={() => onEdit(record)}>编辑</a>
                      <Popconfirm
@@ -192,11 +192,10 @@ const DatabaseTable = (props) => {
                      {record.type === '表' ? <a style={{ marginLeft: 10 }} onClick={() => marking(record.id)}>打标</a> : null}
                   </>
                }
-
-               {user.role !== '数据消费者' ? null : record.type === '表' ? resourceApplicationsRecords.length === 0 ?
+               {isAdmin ? null : record.type === '表' ? resourceApplicationsRecords.length === 0 ?
                   <a style={{ marginLeft: 10 }} onClick={() => applyResources(record)}>申请资源</a> :
                   <span style={{ marginLeft: 10, color: "#c0c0c0" }} title='已存在资源申请'>申请资源</span> : null}
-               {user.role == '数据消费者' ? null :
+               {!isAdmin ? null :
                   record.type === '表' ?
                      <a style={{ marginLeft: 10 }} onClick={() => servicePublication(record)}>REST服务发布</a> : null
                }
@@ -272,7 +271,7 @@ const DatabaseTable = (props) => {
    return <Spin spinning={isRequesting}>
       <Row style={{ marginBottom: 16 }}>
          <Col span={12}>
-            {user.role == '数据消费者' ? null : <>
+            {!isAdmin ? null : <>
                <Button type='primary' onClick={() => {
                   dispatch(metadataManagement.getMetadataModels({ modelTypes: ModelTypes.join(',') })).then(res => {
                      if (res.success) {
diff --git a/web/client/src/sections/metadataManagement/containers/filesTable.js b/web/client/src/sections/metadataManagement/containers/filesTable.js
index c1f26f9..58edd4a 100644
--- a/web/client/src/sections/metadataManagement/containers/filesTable.js
+++ b/web/client/src/sections/metadataManagement/containers/filesTable.js
@@ -12,7 +12,7 @@ import { RouteTable } from '$utils'
 
 const FilesTable = (props) => {
     const { user, dispatch, actions, clientHeight, resourceCatalogId, resourceCatalogKey,
-        isRequesting, metadataModels, tagList, metadataResourceApplications, params } = props;
+        isRequesting, metadataModels, tagList, metadataResourceApplications, params, isAdmin } = props;
     const { metadataManagement } = actions;
     const SortValues = { 'ascend': 'asc', 'descend': 'desc' };
     const [tableData, setTableData] = useState([]);
@@ -207,7 +207,7 @@ const FilesTable = (props) => {
                 let resourceApplicationsRecords = metadataResourceApplications.filter(ra =>
                     ra.applyBy == user.id && ra.resourceName === record.name && ra.resourceId == record.id && !!record.token);
                 return <ButtonGroup>
-                    {user.role == '数据消费者' ? null :
+                    {!isAdmin ? null :
                         <>
                             <a style={{ marginLeft: 10 }} onClick={() => onEdit(record)}>编辑</a>
                             <Popconfirm
@@ -218,7 +218,7 @@ const FilesTable = (props) => {
                         </>
                     }
 
-                    {user.role == '系统管理员' ? '' : resourceApplicationsRecords.length === 0 ?
+                    {isAdmin ? '' : resourceApplicationsRecords.length === 0 ?
                         <a style={{ marginLeft: 10 }} onClick={() => applyResources(record)}>申请资源</a> :
                         <span style={{ marginLeft: 10, color: "#c0c0c0" }} title='已存在资源申请'>申请资源</span>}
                 </ButtonGroup>
@@ -305,7 +305,7 @@ const FilesTable = (props) => {
     return <Spin spinning={isRequesting}>
         <Row style={{ marginBottom: 16 }}>
             <Col span={12}>
-                {user.role == '数据消费者' ? null : <>
+                {!isAdmin ? null : <>
                     <Button type='primary' onClick={() => {
                         dispatch(metadataManagement.getMetadataModels({ modelTypes: '文件' })).then(res => {
                             if (res.success) {
diff --git a/web/client/src/sections/metadataManagement/containers/latestMetadata.js b/web/client/src/sections/metadataManagement/containers/latestMetadata.js
index dc40a09..ed9434f 100644
--- a/web/client/src/sections/metadataManagement/containers/latestMetadata.js
+++ b/web/client/src/sections/metadataManagement/containers/latestMetadata.js
@@ -8,10 +8,12 @@ import MetadataTab from './metadataTab';
 import MetadataDetails from './metadataDetails';
 let expandedKeysData = [];
 let allTreeNodeKeys = [];
+let resourceCatalogRawData = [];
 
 const LatestMetadata = (props) => {
     const { user, dispatch, actions, history, clientHeight, resourceCatalog, isRequesting, location, match, organization } = props;
     const { metadataManagement } = actions;
+    const [isAdmin, setIsAdmin] = useState(false);
     const [resourceCatalogData, setResourceCatalogData] = useState([]);
     const [selectedKeys, setSelectedKeys] = useState([]);
     const [expandedKeys, setExpandedKeys] = useState([]);
@@ -36,6 +38,7 @@ const LatestMetadata = (props) => {
         dispatch(metadataManagement.getResourceCatalog()).then(res => {
             const { data } = res.payload;
             if (res.success) {
+                resourceCatalogRawData = data;
                 allTreeNodeKeys = []
                 const resourceCatalogData = getTreeNodeData(data, null, 'rc', [], null);
                 setResourceCatalogData(resourceCatalogData);
@@ -47,6 +50,8 @@ const LatestMetadata = (props) => {
                         params?.catalogKey ? setSelectedKeys([params?.catalogKey]) : setSelectedKeys(expandedKeysData);
                         params?.catalogKey ? setExpandedKeys(getExpandKeys([params?.catalogKey])) : setExpandedKeys(expandedKeys);
                         params?.treeId && setResourceCatalogId(params?.treeId);
+                        params?.treeId && params?.treeId && setIsAdmin(user?.username === 'SuperAdmin'
+                            || (user?.role === '系统管理员' && user?.orgId == resourceCatalogRawData.find(a => a.id == params?.treeId)?.orgId));
                         expandedKeysData = [];
                     }
                 } else {
@@ -60,7 +65,10 @@ const LatestMetadata = (props) => {
         const keyArr = selectedData[0].split('-');
         keyArr.shift();//['rc-2-5']->返回'rc';keyArr:['2','5']
         const allExpandedKeys = allTreeNodeKeys.filter(k => keyArr.includes(k.id.toString()));
-        !params?.treeId && setResourceCatalogId(keyArr.pop());
+        const resourceCatalogId = keyArr.pop();
+        !params?.treeId && setResourceCatalogId(resourceCatalogId);
+        !params?.treeId && setIsAdmin(user?.username === 'SuperAdmin'
+            || (user?.role === '系统管理员' && user?.orgId == resourceCatalogRawData.find(a => a.id == resourceCatalogId)?.orgId));
         setResourceCatalogKey(selectedData[0]);
         const resourceCatalogPath = allExpandedKeys.map(a => a.name);
         setResourceCatalogPath(resourceCatalogPath);
@@ -104,27 +112,29 @@ const LatestMetadata = (props) => {
     const renderTreeNode = (ds, dataSource) => {
         return <div className={theStyle.icon} style={{ width: 180 }}>
             {setTreeNodeTitle(ds.name)}
-            <EditOutlined title='修改' className={theStyle.tip} onClick={() => {
-                let record = JSON.parse(JSON.stringify(ds));
-                let parentData = dataSource.filter(rc => rc.id === record.parent);
-                record.parentName = parentData.length ? parentData[0].name : '';
-                setEditData({ record: record, title: '修改子类', child: ds.parent ? true : false, });
-                setModalVisible(true);
-            }} />
-            <Popconfirm placement="top" title={'确定删除该资源目录吗？'} onConfirm={() => {
-                dispatch(metadataManagement.delResourceCatalog(ds.id)).then((res) => {
-                    if (res.success) {
-                        expandedKeysData = []; initData(true);
-                    }
-                    setModalVisible(false);
-                });
-            }} okText="确定" cancelText="取消">
-                <MinusCircleOutlined title='删除' className={theStyle.tip} />
-            </Popconfirm>
-            <PlusCircleOutlined title='新建' className={theStyle.tip} onClick={() => {
-                setEditData({ record: { parent: ds.id, parentName: ds.name }, title: '新建子类', child: true, add: true });
-                setModalVisible(true);
-            }} />
+            {(user?.username === 'SuperAdmin' || (user?.role === '系统管理员' && user?.orgId == ds?.orgId)) && <>
+                <EditOutlined title='修改' className={theStyle.tip} onClick={() => {
+                    let record = JSON.parse(JSON.stringify(ds));
+                    let parentData = dataSource.filter(rc => rc.id === record.parent);
+                    record.parentName = parentData.length ? parentData[0].name : '';
+                    setEditData({ record: record, title: '修改子类', child: ds.parent ? true : false, });
+                    setModalVisible(true);
+                }} />
+                <Popconfirm placement="top" title={'确定删除该资源目录吗？'} onConfirm={() => {
+                    dispatch(metadataManagement.delResourceCatalog(ds.id)).then((res) => {
+                        if (res.success) {
+                            expandedKeysData = []; initData(true);
+                        }
+                        setModalVisible(false);
+                    });
+                }} okText="确定" cancelText="取消">
+                    <MinusCircleOutlined title='删除' className={theStyle.tip} />
+                </Popconfirm>
+                <PlusCircleOutlined title='新建' className={theStyle.tip} onClick={() => {
+                    setEditData({ record: { parent: ds.id, parentName: ds.name, orgId: ds?.orgId }, title: '新建子类', child: true, add: true });
+                    setModalVisible(true);
+                }} />
+            </>}
         </div >
     };
     //新建、修改
@@ -194,7 +204,7 @@ const LatestMetadata = (props) => {
                     allowClear onChange={onChangeSearch}
                     onKeyPress={onChangeSearch} />
                 {user?.role == '系统管理员' && <Button type='primary' style={{ marginBottom: 16 }} onClick={() => {
-                    setEditData({ title: '新建资源目录', add: true });
+                    setEditData({ title: '新建资源目录', add: true, record: { orgId: user?.orgId } });
                     setModalVisible(true);
                 }}>新建资源目录</Button>}
                 <Tree
@@ -222,11 +232,13 @@ const LatestMetadata = (props) => {
                     <MetadataDetails resourceCatalogId={resourceCatalogId}
                         resourceCatalogKey={resourceCatalogKey}
                         resourceCatalogPath={resourceCatalogPath}
-                        match={match} /> :
+                        match={match}
+                        isAdmin={isAdmin} /> :
                     <MetadataTab resourceCatalogId={resourceCatalogId}
                         resourceCatalogKey={resourceCatalogKey}
                         resourceCatalogPath={resourceCatalogPath}
                         params={params}
+                        isAdmin={isAdmin}
                     />
                     //     <MetadataTab resourceCatalogId={params?.treeId}
                     //     resourceCatalogKey={params?.catalogKey}
diff --git a/web/client/src/sections/metadataManagement/containers/metadataDetails.js b/web/client/src/sections/metadataManagement/containers/metadataDetails.js
index 4b62da2..1a06c3e 100644
--- a/web/client/src/sections/metadataManagement/containers/metadataDetails.js
+++ b/web/client/src/sections/metadataManagement/containers/metadataDetails.js
@@ -7,7 +7,7 @@ import MetadataDatabaseModal from '../components/metadataDatabaseModal';
 import { ModelTypes, ConfigurableTypes } from '../constants/index';
 
 const MetadataDetails = (props) => {
-    const { user, actions, dispatch, clientHeight, metadataModels, isRequesting, resourceCatalogPath, match } = props;
+    const { user, actions, dispatch, clientHeight, metadataModels, isRequesting, resourceCatalogPath, match, isAdmin } = props;
     const { metadataManagement } = actions;
     const [activeKey, setActiveKey] = useState('info');
     const [databasesRecord, setDatabasesRecord] = useState(null);
@@ -108,7 +108,7 @@ const MetadataDetails = (props) => {
 
         return databasesRecord && (ConfigurableTypes['表'].includes(databasesRecord.type) || databasesRecord.type === '视图') ? null : <Spin spinning={isRequesting}>
             <div style={{ marginBottom: 16 }}>
-                {user?.role == '系统管理员' && <Button type='primary' onClick={() => {
+                {isAdmin && <Button type='primary' onClick={() => {
                     setEditData({ add: true, title: '新建库表元数据', record: { path: '/' + resourceCatalogPath.join('/'), type: ConfigurableTypes[databasesRecord.type][0] } });
                     setModalVisible(true);
                 }}>新建</Button>}
diff --git a/web/client/src/sections/metadataManagement/containers/metadataTab.js b/web/client/src/sections/metadataManagement/containers/metadataTab.js
index a79a43d..ed61f76 100644
--- a/web/client/src/sections/metadataManagement/containers/metadataTab.js
+++ b/web/client/src/sections/metadataManagement/containers/metadataTab.js
@@ -7,7 +7,7 @@ import RestapisTable from './restapisTable';
 import { push } from 'react-router-redux';
 
 const MetadataTab = (props) => {
-    const { resourceCatalogId, resourceCatalogKey, resourceCatalogPath, actions, dispatch, params } = props;
+    const { resourceCatalogId, resourceCatalogKey, resourceCatalogPath, actions, dispatch, params, isAdmin } = props;
     const [activeKey, setActiveKey] = useState(params?.type || 'databases');
     useEffect(() => {
         if (!params?.type)
@@ -42,11 +42,11 @@ const MetadataTab = (props) => {
         </Tabs>
         {
             activeKey === 'databases' && resourceCatalogId ? <DatabaseTable params={params} resourceCatalogId={resourceCatalogId}
-                resourceCatalogKey={resourceCatalogKey} resourceCatalogPath={resourceCatalogPath} setView={onView} /> :
+                resourceCatalogKey={resourceCatalogKey} resourceCatalogPath={resourceCatalogPath} setView={onView} isAdmin={isAdmin} /> :
                 activeKey === 'files' && resourceCatalogId ? <FilesTable params={params} resourceCatalogId={resourceCatalogId}
-                    resourceCatalogKey={resourceCatalogKey} resourceCatalogPath={resourceCatalogPath} /> :
+                    resourceCatalogKey={resourceCatalogKey} resourceCatalogPath={resourceCatalogPath} isAdmin={isAdmin} /> :
                     activeKey === 'restapis' && resourceCatalogId ? < RestapisTable params={params} resourceCatalogId={resourceCatalogId}
-                        resourceCatalogKey={resourceCatalogKey} resourceCatalogPath={resourceCatalogPath} /> : null
+                        resourceCatalogKey={resourceCatalogKey} resourceCatalogPath={resourceCatalogPath} isAdmin={isAdmin} /> : null
         }
     </div>
 }
diff --git a/web/client/src/sections/metadataManagement/containers/restapisTable.js b/web/client/src/sections/metadataManagement/containers/restapisTable.js
index 7824a79..a8cea8b 100644
--- a/web/client/src/sections/metadataManagement/containers/restapisTable.js
+++ b/web/client/src/sections/metadataManagement/containers/restapisTable.js
@@ -8,7 +8,7 @@ import MetadataResourceModal from '../components/metadataResourceModal';
 
 const RestapisTable = (props) => {
     const { user, dispatch, actions, clientHeight, resourceCatalogId, resourceCatalogKey,
-        isRequesting, metadataModels, tagList, metadataResourceApplications, params } = props;
+        isRequesting, metadataModels, tagList, metadataResourceApplications, params, isAdmin } = props;
     const { metadataManagement } = actions;
     const [tableData, setTableData] = useState([]);
     const [tableDataCount, setTableDataCount] = useState(0);//Table数据
@@ -143,7 +143,7 @@ const RestapisTable = (props) => {
             let resourceApplicationsRecords = metadataResourceApplications.filter(ra =>
                 ra.applyBy == user.id && ra.resourceName === record.name && ra.resourceId == record.id && !!record.token);
             return <ButtonGroup>
-                {user.role == '数据消费者' ? null :
+                {!isAdmin ? null :
                     <>
                         <a style={{ marginLeft: 10 }} onClick={() => onEdit(record)}>编辑</a>
                         <Popconfirm
@@ -154,7 +154,7 @@ const RestapisTable = (props) => {
                     </>
                 }
 
-                {user.role == '系统管理员' ? '' : resourceApplicationsRecords.length === 0 ?
+                {isAdmin ? '' : resourceApplicationsRecords.length === 0 ?
                     <a style={{ marginLeft: 10 }} onClick={() => applyResources(record)}>申请资源</a> :
                     <span style={{ marginLeft: 10, color: "#c0c0c0" }} title='已存在资源申请'>申请资源</span>}
             </ButtonGroup>
@@ -187,7 +187,7 @@ const RestapisTable = (props) => {
     return <Spin spinning={isRequesting}>
         <Row style={{ marginBottom: 16 }}>
             <Col span={12}>
-                {user.role == '数据消费者' ? null : <>  <Button type='primary' onClick={() => {
+                {!isAdmin ? null : <>  <Button type='primary' onClick={() => {
                     dispatch(metadataManagement.getMetadataModels({ modelTypes: '接口' })).then(res => {
                         if (res.success) {
                             setEditData({ add: true, title: '新建接口元数据', record: {} });

From 22624f127ae6013afc32d8163acd9526b0a4a113 Mon Sep 17 00:00:00 2001
From: liujiangyong <liu.jiangyong@free-sun.com.cn>
Date: Fri, 3 Nov 2023 15:24:38 +0800
Subject: [PATCH 4/4] =?UTF-8?q?(*)=20=E4=B8=9A=E5=8A=A1=E5=85=83=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=AE=A1=E7=90=86=E6=9D=83=E9=99=90=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/businessDatabaseModal.js               |  5 +++--
 .../containers/businessDatabaseTable.js               | 11 ++++++-----
 .../containers/businessFilesTable.js                  | 11 ++++++-----
 .../metadataManagement/containers/businessMetadata.js | 11 +++++++++--
 .../containers/businessRestapisTable.js               | 11 ++++++-----
 .../metadataManagement/containers/businessTab.js      |  8 ++++----
 6 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/web/client/src/sections/metadataManagement/components/businessDatabaseModal.js b/web/client/src/sections/metadataManagement/components/businessDatabaseModal.js
index 376f38f..07af42f 100644
--- a/web/client/src/sections/metadataManagement/components/businessDatabaseModal.js
+++ b/web/client/src/sections/metadataManagement/components/businessDatabaseModal.js
@@ -6,7 +6,7 @@ const basicInfo = [{ name: '元数据名称：', key: 'name' },
 { name: '上下文路径：', key: 'path' },
 { name: '元数据详情：', key: 'description' }];
 const BusinessDatabaseModal = (props) => {
-    const { onConfirm, onCancel, editData, metadataModels, resourceCatalogPath, businessType } = props;
+    const { onConfirm, onCancel, editData, metadataModels, resourceCatalogPath, businessType, isAdmin } = props;
     const [form] = Form.useForm();
     useEffect(() => {
     }, []);
@@ -66,6 +66,7 @@ const BusinessDatabaseModal = (props) => {
     return (
         <Modal title={editData.title} open={true} destroyOnClose
             okText='确定' width={800}
+            footer={!isAdmin ? null : undefined}
             onOk={() => handleOk(null)}
             onCancel={onCancel}>
             {editData.record && editData.record.businessMetadata.length ?
@@ -87,7 +88,7 @@ const BusinessDatabaseModal = (props) => {
                         ({ getFieldValue, validateFields }) => ({
                             validator(_, value) { return validatorNull(_, value, getFieldValue, validateFields, item.name) }
                         })]}>
-                        <Input style={{ width: '90%' }} placeholder={`请输入${item.name}`} />
+                        <Input style={{ width: '90%' }} placeholder={`请输入${item.name}`} disabled={!isAdmin} />
                     </Form.Item>
                 )}
             </Form>
diff --git a/web/client/src/sections/metadataManagement/containers/businessDatabaseTable.js b/web/client/src/sections/metadataManagement/containers/businessDatabaseTable.js
index f9de168..17ccef9 100644
--- a/web/client/src/sections/metadataManagement/containers/businessDatabaseTable.js
+++ b/web/client/src/sections/metadataManagement/containers/businessDatabaseTable.js
@@ -6,7 +6,7 @@ import FileSaver from 'file-saver';
 import BusinessDatabaseModal from '../components/businessDatabaseModal';
 const BusinessDatabaseTable = (props) => {
     const { user, dispatch, actions, clientHeight, resourceCatalogId,
-        resourceCatalogPath, isRequesting, metadataModels } = props;
+        resourceCatalogPath, isRequesting, metadataModels, isAdmin } = props;
     const { metadataManagement } = actions;
     const SortValues = { 'ascend': 'asc', 'descend': 'desc' };
     const [tableData, setTableData] = useState([]);
@@ -201,13 +201,13 @@ const BusinessDatabaseTable = (props) => {
                 if (record.businessMetadataDatabases.length) {
                     return <div>
                         <a style={{ marginLeft: 10 }} onClick={() => onAdd(record, false)}>查看</a>
-                        <Popconfirm
+                        {isAdmin && <Popconfirm
                             title="是否确认删除该业务元数据？"
                             onConfirm={() => confirmDelete(record.businessMetadataDatabases[0].id)}
-                        > <a style={{ marginLeft: 10 }}>删除</a></Popconfirm>
+                        > <a style={{ marginLeft: 10 }}>删除</a></Popconfirm>}
                     </div>
                 } else
-                    return <a style={{ marginLeft: 10 }} onClick={() => onAdd(record, true)}>新建</a>
+                    return isAdmin && <a style={{ marginLeft: 10 }} onClick={() => onAdd(record, true)}>新建</a>
             }
         }];
 
@@ -329,7 +329,8 @@ const BusinessDatabaseTable = (props) => {
                     editData={editData}
                     onCancel={() => setModalVisible(false)}
                     onConfirm={onConfirm}
-                    resourceCatalogPath={resourceCatalogPath} /> : ''
+                    resourceCatalogPath={resourceCatalogPath}
+                    isAdmin={isAdmin} /> : ''
         }
     </Spin >
 }
diff --git a/web/client/src/sections/metadataManagement/containers/businessFilesTable.js b/web/client/src/sections/metadataManagement/containers/businessFilesTable.js
index 49e91bb..bc18f9d 100644
--- a/web/client/src/sections/metadataManagement/containers/businessFilesTable.js
+++ b/web/client/src/sections/metadataManagement/containers/businessFilesTable.js
@@ -6,7 +6,7 @@ import FileSaver from 'file-saver';
 import BusinessDatabaseModal from '../components/businessDatabaseModal';
 const BusinessFilesTable = (props) => {
     const { user, dispatch, actions, clientHeight, resourceCatalogId,
-        resourceCatalogPath, isRequesting, metadataModels } = props;
+        resourceCatalogPath, isRequesting, metadataModels, isAdmin } = props;
     const { metadataManagement } = actions;
     const SortValues = { 'ascend': 'asc', 'descend': 'desc' };
     const [tableData, setTableData] = useState([]);
@@ -190,13 +190,13 @@ const BusinessFilesTable = (props) => {
                 if (record.businessMetadataFiles.length) {
                     return <div>
                         <a style={{ marginLeft: 10 }} onClick={() => onAdd(record, false)}>查看</a>
-                        <Popconfirm
+                        {isAdmin && <Popconfirm
                             title="是否确认删除该业务元数据？"
                             onConfirm={() => confirmDelete(record.businessMetadataFiles[0].id)}
-                        > <a style={{ marginLeft: 10 }}>删除</a></Popconfirm>
+                        > <a style={{ marginLeft: 10 }}>删除</a></Popconfirm>}
                     </div>
                 } else
-                    return <a style={{ marginLeft: 10 }} onClick={() => onAdd(record, true)}>新建</a>
+                    return isAdmin && <a style={{ marginLeft: 10 }} onClick={() => onAdd(record, true)}>新建</a>
             }
         }];
 
@@ -317,7 +317,8 @@ const BusinessFilesTable = (props) => {
                     onCancel={() => setModalVisible(false)}
                     onConfirm={onConfirm}
                     resourceCatalogPath={resourceCatalogPath}
-                    businessType='文件' /> : ''
+                    businessType='文件' 
+                    isAdmin={isAdmin} /> : ''
         }
     </Spin >
 }
diff --git a/web/client/src/sections/metadataManagement/containers/businessMetadata.js b/web/client/src/sections/metadataManagement/containers/businessMetadata.js
index 23e115d..67be5d6 100644
--- a/web/client/src/sections/metadataManagement/containers/businessMetadata.js
+++ b/web/client/src/sections/metadataManagement/containers/businessMetadata.js
@@ -4,10 +4,12 @@ import { Spin, Row, Col, Tree, Tooltip, Input } from 'antd';
 import BusinessTab from './businessTab';
 let expandedKeysData = [];
 let allTreeNodeKeys = [];
+let resourceCatalogRawData = [];
 
 const BusinessMetadata = (props) => {
     const { user, dispatch, actions, clientHeight, isRequesting, resourceCatalog } = props;
     const { metadataManagement } = actions;
+    const [isAdmin, setIsAdmin] = useState(false);
     const [resourceCatalogData, setResourceCatalogData] = useState([]);
     const [selectedKeys, setSelectedKeys] = useState([]);
     const [expandedKeys, setExpandedKeys] = useState([]);
@@ -23,6 +25,7 @@ const BusinessMetadata = (props) => {
         dispatch(metadataManagement.getResourceCatalog()).then(res => {
             const { data } = res.payload;
             if (res.success) {
+                resourceCatalogRawData = data;
                 allTreeNodeKeys = []
                 const resourceCatalogData = getTreeNodeData(data, null, 'rc', [], null);
                 setResourceCatalogData(resourceCatalogData);
@@ -44,7 +47,10 @@ const BusinessMetadata = (props) => {
         const keyArr = selectedData[0].split('-');
         keyArr.shift();//['rc-2-5']->返回'rc';keyArr:['2','5']
         const allExpandedKeys = allTreeNodeKeys.filter(k => keyArr.includes(k.id.toString()));
-        setResourceCatalogId(keyArr.pop());
+        const resourceCatalogId = keyArr.pop();
+        setResourceCatalogId(resourceCatalogId);
+        setIsAdmin(user?.username === 'SuperAdmin'
+            || (user?.role === '系统管理员' && user?.orgId == resourceCatalogRawData.find(a => a.id == resourceCatalogId)?.orgId));
         setResourceCatalogKey(selectedData[0]);
         const resourceCatalogPath = allExpandedKeys.map(a => a.name);
         setResourceCatalogPath(resourceCatalogPath);
@@ -161,7 +167,8 @@ const BusinessMetadata = (props) => {
             <Col style={{ width: 'calc(100% - 240px)' }}>
                 <BusinessTab resourceCatalogId={resourceCatalogId}
                     resourceCatalogKey={resourceCatalogKey}
-                    resourceCatalogPath={resourceCatalogPath} />
+                    resourceCatalogPath={resourceCatalogPath}
+                    isAdmin={isAdmin} />
             </Col>
         </Row>
     </Spin>
diff --git a/web/client/src/sections/metadataManagement/containers/businessRestapisTable.js b/web/client/src/sections/metadataManagement/containers/businessRestapisTable.js
index 7c79801..0c8e8c6 100644
--- a/web/client/src/sections/metadataManagement/containers/businessRestapisTable.js
+++ b/web/client/src/sections/metadataManagement/containers/businessRestapisTable.js
@@ -6,7 +6,7 @@ import FileSaver from 'file-saver';
 import BusinessDatabaseModal from '../components/businessDatabaseModal';
 const BusinessFilesTable = (props) => {
     const { user, dispatch, actions, clientHeight, resourceCatalogId,
-        resourceCatalogPath, isRequesting, metadataModels } = props;
+        resourceCatalogPath, isRequesting, metadataModels, isAdmin } = props;
     const { metadataManagement } = actions;
     const SortValues = { 'ascend': 'asc', 'descend': 'desc' };
     const [tableData, setTableData] = useState([]);
@@ -190,13 +190,13 @@ const BusinessFilesTable = (props) => {
                 if (record.businessMetadataRestapis.length) {
                     return <div>
                         <a style={{ marginLeft: 10 }} onClick={() => onAdd(record, false)}>查看</a>
-                        <Popconfirm
+                        {isAdmin && <Popconfirm
                             title="是否确认删除该业务元数据？"
                             onConfirm={() => confirmDelete(record.businessMetadataRestapis[0].id)}
-                        > <a style={{ marginLeft: 10 }}>删除</a></Popconfirm>
+                        > <a style={{ marginLeft: 10 }}>删除</a></Popconfirm>}
                     </div>
                 } else
-                    return <a style={{ marginLeft: 10 }} onClick={() => onAdd(record, true)}>新建</a>
+                    return isAdmin && <a style={{ marginLeft: 10 }} onClick={() => onAdd(record, true)}>新建</a>
             }
         }];
 
@@ -317,7 +317,8 @@ const BusinessFilesTable = (props) => {
                     onCancel={() => setModalVisible(false)}
                     onConfirm={onConfirm}
                     resourceCatalogPath={resourceCatalogPath}
-                    businessType='接口' /> : ''
+                    businessType='接口' 
+                    isAdmin={isAdmin} /> : ''
         }
     </Spin >
 }
diff --git a/web/client/src/sections/metadataManagement/containers/businessTab.js b/web/client/src/sections/metadataManagement/containers/businessTab.js
index 2fcda8f..cfca376 100644
--- a/web/client/src/sections/metadataManagement/containers/businessTab.js
+++ b/web/client/src/sections/metadataManagement/containers/businessTab.js
@@ -6,7 +6,7 @@ import BusinessFilesTable from './businessFilesTable';
 import BusinessRestapisTable from './businessRestapisTable';
 
 const BusinessTab = (props) => {
-    const { resourceCatalogId, resourceCatalogKey, resourceCatalogPath, actions, dispatch } = props;
+    const { resourceCatalogId, resourceCatalogKey, resourceCatalogPath, actions, dispatch, isAdmin } = props;
     const [activeKey, setActiveKey] = useState('databases');
     useEffect(() => {
         setActiveKey('databases');
@@ -36,11 +36,11 @@ const BusinessTab = (props) => {
         </Tabs>
         {
             activeKey === 'databases' && resourceCatalogId ? <BusinessDatabaseTable resourceCatalogId={resourceCatalogId}
-                resourceCatalogKey={resourceCatalogKey} resourceCatalogPath={resourceCatalogPath} /> :
+                resourceCatalogKey={resourceCatalogKey} resourceCatalogPath={resourceCatalogPath} isAdmin={isAdmin} /> :
                 activeKey === 'files' && resourceCatalogId ? <BusinessFilesTable resourceCatalogId={resourceCatalogId}
-                    resourceCatalogKey={resourceCatalogKey} resourceCatalogPath={resourceCatalogPath} /> :
+                    resourceCatalogKey={resourceCatalogKey} resourceCatalogPath={resourceCatalogPath} isAdmin={isAdmin} /> :
                     activeKey === 'restapis' && resourceCatalogId ? <BusinessRestapisTable resourceCatalogId={resourceCatalogId}
-                        resourceCatalogKey={resourceCatalogKey} resourceCatalogPath={resourceCatalogPath} /> :
+                        resourceCatalogKey={resourceCatalogKey} resourceCatalogPath={resourceCatalogPath} isAdmin={isAdmin} /> :
                         null
         }
     </div>