Merge pull request 'feature/cl' (#15) from feature/cl into master

Reviewed-on: http://221.226.25.34:3000/liang.cheng/org-chart-frant/pulls/15

src/components/topBar/index.jsx

@@ -305,16 +305,38 @@ export class TopBar extends React.Component {
             </Tooltip>
           </Col>
           <Col span={16}>
-            <Button
-              type="primary"
-              style={{ marginRight: '10px' }}
-              disabled={disabled}
-              onClick={() => {
-                this.setState({ open: true });
-              }}
-            >
-              {getLabel(547305, labelData)}
-            </Button>
+            {this.state.requestData.fclass == '0' && (
+              <span>
+                <Button
+                  type="primary"
+                  style={{ marginRight: '10px' }}
+                  disabled={disabled}
+                  onClick={() => {
+                    this.setState({ open: true });
+                  }}
+                >
+                  {getLabel(547305, labelData)}
+                </Button>
+                <Button
+                  type="primary"
+                  style={{ marginRight: '10px' }}
+                  onClick={() => {
+                    window.open('#/dragtree', 'blank');
+                  }}
+                >
+                  {getLabel(547310, labelData)}
+                </Button>
+                <Button
+                  type="primary"
+                  style={{ marginRight: '10px' }}
+                  onClick={() => {
+                    window.open('#/statistics', 'blank');
+                  }}
+                >
+                  {getLabel(547313, labelData)}
+                </Button>{' '}
+              </span>
+            )}
 
             <Button
               type="primary"
@@ -325,24 +347,7 @@ export class TopBar extends React.Component {
             >
               {getLabel(547307, labelData)}
             </Button>
-            <Button
-              type="primary"
-              style={{ marginRight: '10px' }}
-              onClick={() => {
-                window.open('#/dragtree', 'blank');
-              }}
-            >
-              {getLabel(547310, labelData)}
-            </Button>
-            <Button
-              type="primary"
-              style={{ marginRight: '10px' }}
-              onClick={() => {
-                window.open('#/statistics', 'blank');
-              }}
-            >
-              {getLabel(547313, labelData)}
-            </Button>
+
             <Dropdown overlay={this.menu}>
               <Button type="primary">{getLabel(547314, labelData)}</Button>
             </Dropdown>

src/pages/company.jsx

@@ -76,9 +76,10 @@ export default function companyPage() {
           '/api/bs/hrmorganization/orgchart/asyncCompanyData' +
           qs.stringify(request, { addQueryPrefix: true });
       } else {
+        let request = { ...topbar.state.requestData, ids: idsStr };
         api =
-          '/api/bs/hrmorganization/orgchart/asyncCompanyData?fclass=0&fisvitual=0&id=0&root=0&ids=' +
-          idsStr;
+          '/api/bs/hrmorganization/orgchart/asyncCompanyData' +
+          qs.stringify(request, { addQueryPrefix: true });
       }
       fetch(api)
         .then((res) => res.json())

src/pages/user.jsx

@@ -99,7 +99,7 @@ export default function userPage() {
   // 获取数据
   useEffect(() => {
     document.cookie =
-      'ecology_JSessionid=aaaIt6Y2NuzAQ98Ci0Jaz; Systemlanguid=7; JSESSIONID=aaaIt6Y2NuzAQ98Ci0Jaz; loginidweaver=sysadmin; loginuuids=1; languageidweaver=8; __randcode__=486bc6ba-9c04-47fc-a977-f7c55bab42e9';
+      'ecology_JSessionid=aaa5JLqrHUV6R9P1cmTbz; JSESSIONID=aaa5JLqrHUV6R9P1cmTbz; loginuuids=1; languageidweaver=7; Systemlanguid=7; loginidweaver=sysadmin; __randcode__=72a0b641-7599-4301-a47f-61620f350ec5';
     d3.json(
       '/api/bs/hrmorganization/orgchart/userData?fclass=0&fisvitual=0&root=0&level=3&id=0',
     ).then((data) => {