From d1760f765acfaa9d74b4a3281421f1ae92fcdd72 Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Tue, 30 Jul 2024 16:22:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8A=B1=E5=90=8D=E6=90=9C=E7=B4=A2=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organization/components/resource/resource.js  | 10 ++++++----
 pc4mobx/organization/stores/resource.js           | 15 +++++++++------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/pc4mobx/organization/components/resource/resource.js b/pc4mobx/organization/components/resource/resource.js
index e10bb12..63da137 100644
--- a/pc4mobx/organization/components/resource/resource.js
+++ b/pc4mobx/organization/components/resource/resource.js
@@ -333,7 +333,8 @@ export default class Resource extends React.Component {
 
         const btn = [
             (<Button ecId={`${this && this.props && this.props.ecId || ''}_Button@bx87i8`} type="primary" onClick={() => {
-                resource.selectTreeNodeInfo = {};resource.setPanelStatus(false);resource.getTableInfo(); 
+                resource.isBaseValue = false;
+                resource.selectTreeNodeInfo = {}; resource.setPanelStatus(false);resource.getTableInfo(); 
             }}>{i18n.button.search()}</Button>),
             (<Button ecId={`${this && this.props && this.props.ecId || ''}_Button@218ju6`} type="primary" onClick={() => this.saveTemplate()}>{i18n.button.saveTemplate()}</Button>),
             (<Button ecId={`${this && this.props && this.props.ecId || ''}_Button@218ju7`} type="primary" onClick={() => resource.openSearchDialog()}>{i18n.button.conditionSet()}</Button>),
@@ -546,7 +547,7 @@ export default class Resource extends React.Component {
                             <WeaTab ecId={`${this && this.props && this.props.ecId || ''}_WeaTab@9c3zts`}
                                 searchType={['base', 'advanced']}
                                 showSearchAd={isPanelShow}
-                                searchsBaseValue={this.isEmptyObject(form2.getFormParams()) ? lastName : form2.getFormParams().lastName}
+                                searchsBaseValue={this.isEmptyObject(form2.getFormParams()) ? lastName : form2.getFormParams()["-1_hrm_lastname"]}
                                 searchsBasePlaceHolder=''
                                 setShowSearchAd={bool => store.setPanelStatus(bool)}
                                 hideSearchAd={() => store.setPanelStatus(false)}
@@ -555,8 +556,9 @@ export default class Resource extends React.Component {
                                 hasMask={false}
                                 buttonsAd={this.getTabBtn()}
                                 onSearch={() => {
-                                        store.hideRadioGroup();store.getTableInfo();
-                                        }}
+                                    store.isBaseValue = true;
+                                    store.hideRadioGroup();store.getTableInfo();
+                                    }}
                                 onSearchChange={val => this.onSearchChange(val)}
                             />
                             <Spin size="large" spinning={exSpinning} tip={getLabel(547647,'正在导出请稍候....')} className="hrm-loading-center-small"/>
diff --git a/pc4mobx/organization/stores/resource.js b/pc4mobx/organization/stores/resource.js
index e942ff5..da3fba2 100644
--- a/pc4mobx/organization/stores/resource.js
+++ b/pc4mobx/organization/stores/resource.js
@@ -47,6 +47,8 @@ export class ResourceStore extends HrmBaseStore{
     @observable form2 = new WeaForm();
     @observable form = new WeaForm();
     @observable lastName = '';
+    @observable isBaseValue = true;
+
     @observable conditionNum = 8;
     @observable ids = ''; //选择行id
     @observable searchConditionLoading = false;
@@ -125,17 +127,18 @@ export class ResourceStore extends HrmBaseStore{
             params = {
                 isQuickSearch:false,
                 ...this.selectTreeNodeInfo,
+                
             }
-            //高级搜索内容为空
-            if (this.isEmptyObject(this.form2.getFormParams())) {
+            //外部INPUT搜索
+            if (this.isBaseValue) {
                 params = {
                     ...params,
-                    lastName: this.lastName,
+                    lastName: this.lastName
                 };
-            } else {
+            }else {
                 params = {
                     ...params,
-                    ...this.form2.getFormParams()
+                    ...this.form2.getFormParams(),
                 };
             }
         }else {
@@ -810,7 +813,7 @@ export class ResourceStore extends HrmBaseStore{
 
     updateFields(val) {
         this.form2.updateFields({
-            lastname: {
+            "-1_hrm_lastname": {
                 value: val
             }
         });