From 4d79c64bcd8b5c78e79a2129d9a7fc9dd3f46815 Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Mon, 24 Oct 2022 19:27:35 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organization/components/resource/ResourceCard.js   | 10 +++++-----
 pc4mobx/organization/stores/newImport.js               |  2 +-
 pc4mobx/organization/stores/resource.js                |  2 --
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/pc4mobx/organization/components/resource/ResourceCard.js b/pc4mobx/organization/components/resource/ResourceCard.js
index 6089231..ad4aecf 100644
--- a/pc4mobx/organization/components/resource/ResourceCard.js
+++ b/pc4mobx/organization/components/resource/ResourceCard.js
@@ -252,35 +252,35 @@ export default class ResourceCard extends React.Component {
                                         <img src="/hrm/hrm_e9/image/workflow.png" alt="" />
                                         <div>
                                             <p>流程总数</p>
-                                            <p onClick={() => { window.open(`/spa/workflow/static/index.html#/main/workflow/listDoing?resourceid=${data.user.id}`) }}>{data.statistical.workflowCount}</p>
+                                            <p onClick={() => { window.open(`/spa/workflow/static/index.html#/main/workflow/listDoing?resourceid=${data.user.ecId}`) }}>{data.statistical.workflowCount}</p>
                                         </div>
                                     </Col>
                                     <Col className='ant-col' span={4}>
                                         <img src="/hrm/hrm_e9/image/doc.png" alt="" />
                                         <div>
                                             <p>文档总数</p>
-                                            <p onClick={() => { window.open(`/spa/document/static/index.html#/main/document/search?viewcondition=2&doccreaterid=${data.user.id}`) }}>{data.statistical.docCount}</p>
+                                            <p onClick={() => { window.open(`/spa/document/static/index.html#/main/document/search?viewcondition=2&doccreaterid=${data.user.ecId}`) }}>{data.statistical.docCount}</p>
                                         </div>
                                     </Col>
                                     <Col className='ant-col' span={4}>
                                         <img src="/hrm/hrm_e9/image/custom.png" alt="" />
                                         <div>
                                             <p>我的客户</p>
-                                            <p onClick={() => { window.open(`/spa/crm/static/index.html#/main/crm/customer/hrmView?searchHrmId=${data.user.id}`) }}>{data.statistical.cusCount}</p>
+                                            <p onClick={() => { window.open(`/spa/crm/static/index.html#/main/crm/customer/hrmView?searchHrmId=${data.user.ecId}`) }}>{data.statistical.cusCount}</p>
                                         </div>
                                     </Col>
                                     <Col className='ant-col' span={4}>
                                         <img src="/hrm/hrm_e9/image/cowork.png" alt="" />
                                         <div>
                                             <p>我的协作</p>
-                                            <p onClick={() => { window.open(`/spa/cowork/static/index.html#/main/cowork/hrmview?searchHrmid=${data.user.id}`) }}>{data.statistical.collaborationCount}</p>
+                                            <p onClick={() => { window.open(`/spa/cowork/static/index.html#/main/cowork/hrmview?searchHrmid=${data.user.ecId}`) }}>{data.statistical.collaborationCount}</p>
                                         </div>
                                     </Col>
                                     <Col className='ant-col' span={4}>
                                         <img src="/hrm/hrm_e9/image/weibo.png" alt="" />
                                         <div>
                                             <p>微博总数</p>
-                                            <p onClick={() => { window.open(`/spa/blog/static/index.html#/user/${data.user.id}`) }}>{data.statistical.weiboCount}</p>
+                                            <p onClick={() => { window.open(`/spa/blog/static/index.html#/user/${data.user.ecId}`) }}>{data.statistical.weiboCount}</p>
                                         </div>
                                     </Col>
                                 </Row>
diff --git a/pc4mobx/organization/stores/newImport.js b/pc4mobx/organization/stores/newImport.js
index 564634b..6c40f26 100644
--- a/pc4mobx/organization/stores/newImport.js
+++ b/pc4mobx/organization/stores/newImport.js
@@ -212,7 +212,7 @@ export class NewImportStore {
     this.pvisable = true;
     //导入文件提交
     let params = {
-      keyField:this.keyField,
+      //keyField:this.keyField,
       importType:this.importType,
       operateType:this.operateType,
       excelfile:this.excelfile,
diff --git a/pc4mobx/organization/stores/resource.js b/pc4mobx/organization/stores/resource.js
index 38cca01..e99ba24 100644
--- a/pc4mobx/organization/stores/resource.js
+++ b/pc4mobx/organization/stores/resource.js
@@ -59,7 +59,6 @@ const {
         if (this.isEmptyObject(this.form2.getFormParams())) {
             params = {
                 ...this.selectTreeNodeInfo,
-                ...this.form2.getFormParams(),
                 lastName: this.lastName
             };
         } else {
@@ -70,7 +69,6 @@ const {
         }
         Api.getSearchList(params).then(res => {
             if (res.code === 200) {
-                //this.setHasRight(res.data.hasRight);
                 res.data.datas && this.tableStore.getDatas(res.data.datas, 1);
             } else {
                 message.warning(res.msg);