From 1bb19972159fc9572d96e776071f00bf58991f58 Mon Sep 17 00:00:00 2001
From: dengyinhuan <deng.yinhuan@free-sun.com.cn>
Date: Tue, 28 Feb 2023 12:31:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E6=B3=A8=E7=BB=93=E6=9E=84=E7=89=A9?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=A4=9A=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/app/lib/models/user.js                    |  2 +-
 .../organization/components/userModal.js      | 26 ++++++++++++++++---
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/api/app/lib/models/user.js b/api/app/lib/models/user.js
index 9d7999a..02245a9 100644
--- a/api/app/lib/models/user.js
+++ b/api/app/lib/models/user.js
@@ -97,7 +97,7 @@ module.exports = dc => {
       autoIncrement: false
     },
     structure: {
-      type: DataTypes.STRING,
+      type: DataTypes.JSON,
       allowNull: true,
       defaultValue: null,
       comment: "结构物",
diff --git a/web/client/src/sections/organization/components/userModal.js b/web/client/src/sections/organization/components/userModal.js
index 4988b85..443f651 100644
--- a/web/client/src/sections/organization/components/userModal.js
+++ b/web/client/src/sections/organization/components/userModal.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { connect } from 'react-redux';
 import { Spin, Card, Modal, TreeSelect, message } from 'antd';
-import ProForm, { ProFormText, ModalForm, ProFormSwitch, ProFormTreeSelect } from '@ant-design/pro-form';
+import ProForm, { ProFormText, ModalForm, ProFormSwitch, ProFormTreeSelect ,ProFormSelect} from '@ant-design/pro-form';
 
 const UserModal = (props) => {
     const { visible, modalType, depData, onVisibleChange, onConfirm, editData ,tableList} = props
@@ -105,10 +105,11 @@ const UserModal = (props) => {
                     />
                 </ProForm.Group>
                 <ProForm.Group>
-                    <ProFormTreeSelect
+                    {/* <ProFormTreeSelect
                         name={['contract', 'structure']}
                         placeholder="请选择结构物"
                         width="md"
+                        mode="multiple"
                         label="关注结构物"
                         required
                         // fieldNames={{
@@ -120,6 +121,7 @@ const UserModal = (props) => {
                           
                         }}
                         fieldProps={{
+                            mode: 'multiple',
                             fieldNames: {
                                 label: 'title',
                             },
@@ -132,7 +134,25 @@ const UserModal = (props) => {
                             return opts
                         }}
                         expandedKeys={["title"]}
-                    />
+                     /> */}
+                      <ProFormSelect
+                      width="md"
+                            label="关注结构物"
+                            name={['contract', 'structure']}
+                            mode="multiple"
+                            // fieldProps={{//这里使用了select的onChange方法，必须使用这样的写法来进行调用onChange方法
+                            //     onChange:(val) => handleChange(val),
+                            // }}
+ 
+                            request={async () => {
+                                console.log(tableList);
+                                const opts = tableList?.map(i=>({label:i.name,value:i.id}))
+                                return opts
+                            }}
+                            placeholder="请选择结构物"
+                            rules={[{ required: true, message: '结构物不能为空' }]}
+                        />
+
                       <ProFormText
                         name={['contract', 'email']}
                         width="md"