From 77632d87c60f9a42e380bc79971eed961414d194 Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Tue, 30 Aug 2022 11:39:15 +0800
Subject: [PATCH] fixed

---
 src/pages/company.jsx |  6 ++----
 src/pages/user.jsx    | 24 ++++++++----------------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/src/pages/company.jsx b/src/pages/company.jsx
index 16ee418..fe15813 100644
--- a/src/pages/company.jsx
+++ b/src/pages/company.jsx
@@ -128,11 +128,9 @@ export default function companyPage() {
     let companyUrl =
       '/spa/organization/static/index.html#/main/organization/group';
     // 分部地址
-    let subcompanyUrl =
-      '/spa/organization/static/index.html#/main/organization/companyExtend/';
+    let subcompanyUrl = `/spa/organization/static/index.html#/main/organization/companyExtend/${d.data.fobjid}`;
     // 部门地址
-    let departmentUrl =
-      '/spa/organization/static/index.html#/main/organization/departmentExtend/';
+    let departmentUrl = `/spa/organization/static/index.html#/main/organization/departmentExtend/${d.data.fobjid}`;
 
     if (d.data.ftype == 0) {
       return `<div onclick="window.open('${companyUrl}', '_blank')">
diff --git a/src/pages/user.jsx b/src/pages/user.jsx
index 1dc6615..a2da5e9 100644
--- a/src/pages/user.jsx
+++ b/src/pages/user.jsx
@@ -197,17 +197,13 @@ export default function userPage() {
     let companyUrl =
       '/spa/organization/static/index.html#/main/organization/group';
     // 分部地址
-    let subcompanyUrl =
-      '/spa/organization/static/index.html#/main/organization/companyExtend/';
+    let subcompanyUrl = `/spa/organization/static/index.html#/main/organization/companyExtend/${d.data.fobjid}`;
     // 部门地址
-    let departmentUrl =
-      '/spa/organization/static/index.html#/main/organization/departmentExtend/';
+    let departmentUrl = `/spa/organization/static/index.html#/main/organization/departmentExtend/${d.data.fobjid}`;
     // 岗位地址
-    let jobtitleUrl =
-      '/spa/organization/static/index.html#/main/organization/jobExtend/';
-
+    let jobtitleUrl = `/spa/organization/static/index.html#/main/organization/jobExtend/${d.data.fobjid}`;
     // 人员地址
-    let userUrl = '/spa/hrm/index_mobx.html#/main/hrm/card/cardInfo/';
+    let userUrl = `/spa/hrm/index_mobx.html#/main/hrm/card/cardInfo/${d.data.fecid}`;
 
     // 通讯录
     let addressBookUrl = '/spa/hrm/index_mobx.html#/main/hrm/addressBook';
@@ -231,21 +227,17 @@ export default function userPage() {
               d.data.ftype == 0
                 ? companyUrl
                 : d.data.ftype == 1
-                ? subcompanyUrl + d.data.fnumber
+                ? subcompanyUrl
                 : d.data.ftype == 2
-                ? departmentUrl + d.data.fnumber
+                ? departmentUrl
                 : ''
             }', '_blank')">${d.data.fname}</span>
             <span style="margin-left: 70px;">
               <img src="./img/user-card/line1.png" />
               <img src="./img/user-card/line2.png" />
             </span>
-            <div style="background: url('./img/user-card/user-card.png'); height: 152px;background-size: 100% 100%;box-sizing: border-box;padding-top: 30px;" onclick="window.open('${
-              userUrl + d.data.fleader
-            }', '_blank')">
-              <div onclick="window.open('${
-                userUrl + d.data.fleader
-              }', '_blank')" style="display: inline-block; background: url('./img/user-card/avatar-outer.png'); background-size: 100% 100%; width: 90px; height: 90px; text-align:center; vertical-align: top; margin-left: 11px;box-sizing: border;">
+            <div style="background: url('./img/user-card/user-card.png'); height: 152px;background-size: 100% 100%;box-sizing: border-box;padding-top: 30px;" onclick="window.open('${userUrl}', '_blank')">
+              <div onclick="window.open('${userUrl}', '_blank')" style="display: inline-block; background: url('./img/user-card/avatar-outer.png'); background-size: 100% 100%; width: 90px; height: 90px; text-align:center; vertical-align: top; margin-left: 11px;box-sizing: border;">
                 <img src="${
                   d.data.fleaderimg
                     ? d.data.fleaderimg