fix

src/pages/carouselFigure/editCarousel.jsx

@@ -15,6 +15,7 @@ import LiveGroup from './LiveGroup';
 import SelectNews from './SelectNews';
 import SelectActivity from './SelectActivity';
 import SelectH5 from './SelectH5';
+import InstitutionSelect from '@/components/SelectButton/InstitutionSelect';
 
 /**
  *
@@ -147,6 +148,21 @@ const Edit = props => {
         value: data.cityId,
         rules: [{ required: true, message: '请选择展示城市' }],
       },
+      {
+        label: '城市公司',
+        name: 'institutionId',
+        render: <InstitutionSelect />,
+        // hidden: () => isHaveActive,
+        value: data.institutionId,
+        rules: [{ required: true, message: '请选择城市公司' }],
+      },
+      // <Form.Item label="城市公司">
+      //     {getFieldDecorator('institutionId',{
+      //       rules: [{ required: true, message: '请选择城市公司' }],
+      //     })(
+      //       <InstitutionSelect />
+      //     )}
+      //   </Form.Item>
       // {
       //   label: '发布位置',
       //   name: 'showPosition',

src/pages/staff/staff/Edit/index.jsx

@@ -206,7 +206,7 @@ const StaffEdit = props => {
       label: '组织机构',
       name: 'institutionIdLis',
       render: <InstitutionSelect multiple/>,
-      value: userData.institutionId,
+      value: userData.institutionIdLis,
       rules: [{ required: true, message: '组织机构' }],
     },
     {