From d6af9ee8360a3832b47e39f6200cc25b14afb32c Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Fri, 10 May 2024 16:38:10 +0800
Subject: [PATCH] =?UTF-8?q?v2=E9=9C=80=E6=B1=82=E5=B0=81=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/topBar/index.jsx | 13 ++++++++++---
 src/pages/company.jsx           |  8 ++++----
 src/pages/user.jsx              |  2 +-
 src/util/i18n.js                |  9 +++++++++
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/components/topBar/index.jsx b/src/components/topBar/index.jsx
index 3e6d76b..74c3d80 100644
--- a/src/components/topBar/index.jsx
+++ b/src/components/topBar/index.jsx
@@ -36,10 +36,10 @@ export class TopBar extends React.Component {
       treeExpandedKeys: [],
       deptTreeData: [],
       requestData: {
-        fclass: '0',
+        fclass: '',
         root: undefined,
         department: undefined,
-        level: '2',
+        level: '1',
         fisvitual: '0',
         hidedept: '0',
       },
@@ -239,6 +239,10 @@ export class TopBar extends React.Component {
           fclasslist: data.fclasslist,
           rootTreeData: data.companyTree,
         });
+        this.handleFormChange({ fclass: data.fclass, root: data.root });
+        this.getDeptTreeData(
+          `/api/bs/hrmorganization/orgchart/getDepartmentTree?fclass=${data.fclass}&subcompany=${data.root}`,
+        );
       });
   };
 
@@ -337,7 +341,7 @@ export class TopBar extends React.Component {
                   })
                 }
               >
-                {i18n.hideDept[language]}：
+                {i18n.hideDept[language]}
               </Checkbox>
 
               <Tooltip
@@ -418,6 +422,9 @@ export class TopBar extends React.Component {
               type="primary"
               style={{ marginRight: '10px' }}
               onClick={() => {
+                if (fclass != '0' && department == undefined) {
+                  return message.warning(`${i18n.searchRemind[language]}`);
+                }
                 this.props.onSearch(this.state.requestData);
               }}
             >
diff --git a/src/pages/company.jsx b/src/pages/company.jsx
index 4627d59..fa6d129 100644
--- a/src/pages/company.jsx
+++ b/src/pages/company.jsx
@@ -113,10 +113,10 @@ export default function companyPage() {
     return fisvitual == '0' ? `./img/back/level1.png` : `./img/back/level5.png`;
   }
 
-  // 获取数据
+  //获取数据
   useEffect(() => {
     d3.json(
-      '/api/bs/hrmorganization/orgchart/companyData?fclass=0&fisvitual=0&hidedept=0&root=0&level=2&id=0',
+      '/api/bs/hrmorganization/orgchart/companyData?id=0&fisvitual=0&hidedept=0&level=1',
     ).then((data) => {
       setData(data.data);
       setHasRight(data?.hasRight);
@@ -392,7 +392,7 @@ export default function companyPage() {
         if (data.data) {
           if (!data.data.length) {
             setData([{}]);
-            message.warning('暂无数据');
+            message.warning(`${i18n.httpRemind[language]}`);
           } else {
             setData(data?.data);
           }
@@ -440,7 +440,7 @@ export default function companyPage() {
           style={{ display: 'block', margin: '0 auto' }}
           src="./img/permission.png"
         />
-        <p style={{ textAlign: 'center' }}>对不起，您暂时没有权限!</p>
+        <p style={{ textAlign: 'center' }}>{i18n.noAuth[language]}</p>
       </div>
     );
   }
diff --git a/src/pages/user.jsx b/src/pages/user.jsx
index b90a477..e425f90 100644
--- a/src/pages/user.jsx
+++ b/src/pages/user.jsx
@@ -99,7 +99,7 @@ export default function userPage() {
   // 获取数据
   useEffect(() => {
     document.cookie =
-      'ecology_JSessionid=aaat6IetRDaXpbGfRHl9y; JSESSIONID=aaat6IetRDaXpbGfRHl9y; Systemlanguid=7; languageidweaver=7; loginidweaver=sysadmin; loginuuids=1;';
+      'ecology_JSessionid=aaa7_lGVbgHyRcJeObn9y; JSESSIONID=aaa7_lGVbgHyRcJeObn9y; Systemlanguid=7; languageidweaver=7; loginuuids=1;';
     d3.json(
       '/api/bs/hrmorganization/orgchart/userData?fclass=0&fisvitual=0&root=0&level=3&id=0',
     ).then((data) => {
diff --git a/src/util/i18n.js b/src/util/i18n.js
index 2c45e6f..16ffde6 100644
--- a/src/util/i18n.js
+++ b/src/util/i18n.js
@@ -22,6 +22,15 @@ export const i18n = {
   placeholder: { cn: '请选择', en: 'Please Select' },
   all: { cn: '全部', en: 'All' },
   showJob: { cn: '是否显示岗位', en: 'Is Show Job' },
+  searchRemind: {
+    cn: '请选择部门根节点再进行查询!',
+    en: 'Please select the department root node to query again!',
+  },
+  httpRemind: { cn: '暂无数据!', en: 'No data available' },
+  noAuth: {
+    cn: '对不起，您暂时没有权限!',
+    en: 'Sorry, you do not have permission for the time being!',
+  },
 
   tips: { cn: '提示', en: 'Tips' },
   tipsContent: {