(*)用户 资源目录关联机构

api/app/lib/controllers/auth/index.js

@@ -6,7 +6,7 @@ const CryptoJS = require('crypto-js');
 const moment = require('moment');
 const uuid = require('uuid');
 
-async function login (ctx, next) {
+async function login(ctx, next) {
     // const transaction = await ctx.fs.dc.orm.transaction();
     try {
         const models = ctx.fs.dc.models;
@@ -23,6 +23,9 @@ async function login (ctx, next) {
                     username: params.username,
                     password: password,
                 },
+                include: [{
+                    model: models.Organization
+                }]
             });
         }
         if (userRes) {
@@ -60,7 +63,7 @@ async function login (ctx, next) {
     }
 }
 
-async function logout (ctx) {
+async function logout(ctx) {
     try {
         const models = ctx.fs.dc.models;
         const params = ctx.request.body;

api/app/lib/controllers/organization/index.js

@@ -51,10 +51,11 @@ function addOrganization(opts) {
         const models = ctx.fs.dc.models;
         try {
             const { name, code } = ctx.request.body
-            const checkName = await models.Organization.findOne({ where: { name, code } });
-            if (checkName) {
+            const checkName = await models.Organization.findOne({ where: { name } });
+            const checkCode = await models.Organization.findOne({ where: { code } });
+            if (checkName || checkCode) {
                 ctx.status = 400;
-                ctx.body = { message: "该机构名称&代码组合已存在" }
+                ctx.body = { message: "机构名称或代码不能重复" }
             } else {
                 let rslt = ctx.request.body;
                 await models.Organization.create(Object.assign({}, rslt))
@@ -79,10 +80,11 @@ function editOrganization(opts) {
             const { id } = ctx.params;
             const body = ctx.request.body;
             const { name, code } = ctx.request.body
-            const checkName = await models.Organization.findOne({ where: { id: { $not: id }, name, code } });
-            if (checkName) {
+            const checkName = await models.Organization.findOne({ where: { id: { $not: id }, name } });
+            const checkCode = await models.Organization.findOne({ where: { id: { $not: id }, code } });
+            if (checkName || checkCode) {
                 ctx.status = 400;
-                ctx.body = { message: '该机构名称&代码组合已存在' }
+                ctx.body = { message: '机构名称或代码不能重复' }
             } else {
                 await models.Organization.update(
                     body,

api/app/lib/index.js

@@ -57,7 +57,7 @@ module.exports.models = function (dc) {
    const {
       DataSource, AcquisitionTask, Adapter, User, MetadataDatabase, MetadataFile, MetadataRestapi, AcquisitionLog, ResourceCatalog,
       BusinessMetadataDatabase, BusinessMetadataFile, BusinessMetadataRestapi, ResourceConsumption, BusinessRule, StandardDoc, DbStatistics
-      , RestfulApi, RestfulApiRecord
+      , RestfulApi, RestfulApiRecord, Organization
    } = dc.models;
 
    AcquisitionTask.belongsTo(DataSource, { foreignKey: 'dataSourceId', targetKey: 'id' });
@@ -91,7 +91,7 @@ module.exports.models = function (dc) {
 
    ResourceConsumption.belongsTo(User, { foreignKey: 'applyBy', targetKey: 'id', as: "applyUser" });
 
-   RestfulApi.hasMany(ResourceConsumption, { foreignKey: 'restServiceId', targetKey: 'id',});
+   RestfulApi.hasMany(ResourceConsumption, { foreignKey: 'restServiceId', targetKey: 'id', });
 
    ResourceConsumption.belongsTo(User, { foreignKey: 'approveBy', targetKey: 'id', as: 'approveUser' });
 
@@ -102,4 +102,6 @@ module.exports.models = function (dc) {
    DataSource.hasMany(DbStatistics, { foreignKey: 'sourceId', sourceKey: 'id' })
 
    RestfulApiRecord.belongsTo(RestfulApi, { foreignKey: 'restServiceId', targetKey: 'id' });
+
+   User.belongsTo(Organization, { foreignKey: 'orgId', targetKey: 'id' });
 };

api/app/lib/models/resource_catalog.js

@@ -51,6 +51,15 @@ module.exports = dc => {
       primaryKey: false,
       field: "parent",
       autoIncrement: false
+    },
+    orgId: {
+      type: DataTypes.INTEGER,
+      allowNull: true,
+      defaultValue: null,
+      comment: null,
+      primaryKey: false,
+      field: "orgId",
+      autoIncrement: false
     }
   }, {
     tableName: "t_resource_catalog",

api/app/lib/models/user.js

@@ -60,6 +60,15 @@ module.exports = dc => {
       primaryKey: false,
       field: "enabled",
       autoIncrement: false
+    },
+    orgId: {
+      type: DataTypes.INTEGER,
+      allowNull: true,
+      defaultValue: null,
+      comment: null,
+      primaryKey: false,
+      field: "orgId",
+      autoIncrement: false
     }
 
   }, {

web/client/src/sections/memberManagement/components/memberModal.js

@@ -11,7 +11,7 @@ import {
 } from '@ant-design/pro-form';
 
 export default (props) => {
-    const { title, triggerRender, editData = null, onFinish, paramsName } = props;
+    const { title, triggerRender, editData = null, onFinish, paramsName, organization } = props;
     const formItemLayout = { labelCol: { span: 6 }, wrapperCol: { span: 16 } };
     const initialValues = editData ? {
         ...editData,
@@ -68,6 +68,15 @@ export default (props) => {
                 label="角色"
             />
 
+            <ProFormSelect
+                disabled={editData}
+                rules={[{ required: true, message: '请选择机构' }]}
+                options={organization?.map(s => ({ label: s.name, value: s.id }))}
+                name="orgId"
+                label="机构"
+            />
+
+
             <ProFormSwitch name="enabled" label="是否启用"
                 fieldProps={
                     { defaultChecked: true }

web/client/src/sections/memberManagement/containers/member.js

@@ -8,7 +8,7 @@ import ResetPasswordModal from '../components/resetPassword';
 import { useFsRequest, ApiTable } from '$utils';
 import './style.less';
 function Member(props) {
-    const { loading, clientHeight, actions, dispatch, member, user } = props;
+    const { loading, clientHeight, actions, dispatch, member, user, organization } = props;
     const [pageSize, setPageSize] = useState(10);
     const [currentPage, setCurrentPage] = useState(1);
     const [searchValue, setSearchValue] = useState('')
@@ -26,13 +26,10 @@ function Member(props) {
 
         dispatch(actions.memberManagement.getUserList(query));
     }
-    const { data: treeData = [] } = useFsRequest({
-        url: ApiTable.getResourceCatalog,
-        refreshDeps: [refreshTree]
-    });
 
     useEffect(() => {
         queryData();
+        dispatch(actions.organization.getOrganizationList());
     }, [pageSize, currentPage]);
 
     const columns = [
@@ -73,6 +70,7 @@ function Member(props) {
                     title="编辑用户"
                     onFinish={onFinish}
                     key="editUser"
+                    organization={organization}
                 />)
                 options.push(
                     <Popconfirm
@@ -149,6 +147,7 @@ function Member(props) {
                     title="新建用户"
                     onFinish={onFinish}
                     key="addModel"
+                    organization={organization}
                 />
             </Col>
             <Col span={12} style={{ display: 'flex', justifyContent: 'flex-end', alignItems: 'center' }}>
@@ -213,14 +212,15 @@ function Member(props) {
 
 function mapStateToProps(state) {
     const {
-        auth, global, datasources, member
+        auth, global, datasources, member, organization
     } = state;
     return {
         loading: datasources.isRequesting,
         clientHeight: global.clientHeight,
         actions: global.actions,
         member: member?.data || {},
-        user: auth.user
+        user: auth.user,
+        organization: organization?.data?.rows || [],
     };
 }
 

web/client/src/sections/metadataManagement/components/resourceCatalogModal.js

@@ -1,8 +1,8 @@
 import React, { useEffect, useState } from 'react';
-import { Modal, Input, Form, message } from 'antd';
+import { Modal, Input, Form, message, Select } from 'antd';
 const { TextArea } = Input;
 const ResourceCatalogModal = (props) => {
-    const { resourceCatalog, onConfirm, onCancel, editData } = props;
+    const { resourceCatalog, onConfirm, onCancel, editData, organization } = props;
     const [form] = Form.useForm();
     useEffect(() => {
     }, []);
@@ -73,6 +73,20 @@ const ResourceCatalogModal = (props) => {
                     })]}>
                     <Input style={{ width: '90%' }} placeholder={`请输入代码`} />
                 </Form.Item>
+
+                <Form.Item
+                    label='机构'
+                    name='orgId'
+                    disabled={editData?.orgId}
+                    rules={[{ required: true, message: '' }]}
+                >
+                    <Select style={{ width: '90%' }} placeholder={`请输入代码`} >
+                        {
+                            organization?.map(s => (<Select.Option value={s.id}>{s.name}</Select.Option>))
+                        }
+                    </Select>
+                </Form.Item>
+
                 <Form.Item
                     label='描述'
                     name='description'

web/client/src/sections/metadataManagement/containers/latestMetadata.js

@@ -10,7 +10,7 @@ let expandedKeysData = [];
 let allTreeNodeKeys = [];
 
 const LatestMetadata = (props) => {
-    const { user, dispatch, actions, history, clientHeight, resourceCatalog, isRequesting, location, match } = props;
+    const { user, dispatch, actions, history, clientHeight, resourceCatalog, isRequesting, location, match, organization } = props;
     const { metadataManagement } = actions;
     const [resourceCatalogData, setResourceCatalogData] = useState([]);
     const [selectedKeys, setSelectedKeys] = useState([]);
@@ -30,6 +30,7 @@ const LatestMetadata = (props) => {
     useEffect(() => {
         const jumpSelectedKey = sessionStorage.getItem('jumpSelectedKey') || null;
         initData(true, jumpSelectedKey);
+        dispatch(actions.organization.getOrganizationList());
     }, [])
     const initData = (configRefresh, jumpSelectedKey) => {
         dispatch(metadataManagement.getResourceCatalog()).then(res => {
@@ -241,18 +242,21 @@ const LatestMetadata = (props) => {
                     resourceCatalog={resourceCatalog}
                     editData={editData}
                     onCancel={() => setModalVisible(false)}
-                    onConfirm={onConfirm} /> : ''
+                    onConfirm={onConfirm}
+                    organization={organization}
+                /> : ''
         }
     </Spin>
 }
 function mapStateToProps(state) {
-    const { global, auth, resourceCatalog } = state;
+    const { global, auth, resourceCatalog, organization } = state;
     return {
         user: auth.user,
         actions: global.actions,
         clientHeight: global.clientHeight,
         resourceCatalog: resourceCatalog?.data || [],
-        isRequesting: resourceCatalog.isRequesting
+        isRequesting: resourceCatalog.isRequesting,
+        organization: organization?.data?.rows || [],
     };
 }
 export default connect(mapStateToProps)(LatestMetadata)