From 644df23ccc7b438b3e54f989a79fd8d40ee8afae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Mon, 12 Jun 2023 16:22:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E8=96=AA=E8=B5=84?=
 =?UTF-8?q?=E6=A1=A3=E6=A1=88=E5=88=97=E8=A1=A8=E5=BB=B6=E8=BF=9F=E7=9A=84?=
 =?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

---
 pc4mobx/hrmSalary/pages/payrollFiles/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/index.js
index 49b2c419..f094e5b0 100644
--- a/pc4mobx/hrmSalary/pages/payrollFiles/index.js
+++ b/pc4mobx/hrmSalary/pages/payrollFiles/index.js
@@ -247,7 +247,7 @@ class Index extends Component {
     });
     queryList(payload, searchItemsValue, url).then(({ data, status }) => {
       this.setState({ loading: { ...loading, query: false } });
-      if (status) {
+      if (status && selectedKey === _.lowerCase(data.listType)) {
         const { pageInfo: paganition } = data;
         const { list: dataSource, total, pageNum: current, pageSize } = paganition;
         this.setState({

From 3c7c03916d7209e30bf384a865025dec72190cf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Fri, 16 Jun 2023 11:46:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E8=96=AA=E9=85=AC?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=88=86=E6=9E=90=E8=AE=BE=E7=BD=AE=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=9A=84=E4=B8=AA=E7=A8=8E=E6=89=A3=E7=BC=B4=E4=B9=89?=
 =?UTF-8?q?=E5=8A=A1=E4=BA=BA=E9=80=89=E9=A1=B9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/pages/reportView/index.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/reportView/index.js b/pc4mobx/hrmSalary/pages/reportView/index.js
index 2031c1c5..c315ae53 100644
--- a/pc4mobx/hrmSalary/pages/reportView/index.js
+++ b/pc4mobx/hrmSalary/pages/reportView/index.js
@@ -31,9 +31,9 @@ class Index extends Component {
   }
 
   componentDidMount() {
-    const { taxAgentStore: { getTaxAgentSelectListAsAdmin } } = this.props;
+    const { taxAgentStore: { fetchTaxAgentOption } } = this.props;
     this.reportGetForm();
-    getTaxAgentSelectListAsAdmin();
+    fetchTaxAgentOption();
   }
 
   reportGetForm = () => {
@@ -98,7 +98,7 @@ class Index extends Component {
 
   render() {
     const { report, dimensionList, statisticalPayload } = this.state;
-    const { attendanceStore: { settingForm }, taxAgentStore: { taxAgentAdminOption } } = this.props;
+    const { attendanceStore: { settingForm }, taxAgentStore: { taxAgentOption } } = this.props;
     return (
       <WeaTop
         title={getLabel(111, "报表查看")}
@@ -137,7 +137,7 @@ class Index extends Component {
                         title={getLabel(111, "统计数据范围及规则设置")}
                         onClick={() => {
                           if (this.reportRef.state.loading) {
-                            message.info(getLabel(111, "列表正在加载中，请稍后"))
+                            message.info(getLabel(111, "列表正在加载中，请稍后"));
                           } else {
                             this.setState({
                               statisticalPayload: { visible: true, id: report.id, dimension: report.dimensionId }
@@ -150,7 +150,7 @@ class Index extends Component {
                     {/*统计数据范围及规则设置弹框*/}
                     <StatisticalMicroSettingsSlide
                       {...statisticalPayload} form={settingForm}
-                      taxAgentAdminOption={taxAgentAdminOption}
+                      taxAgentAdminOption={taxAgentOption}
                       onClose={(isRefresh) => this.setState({
                         statisticalPayload: { visible: false, id: "", dimension: "" }
                       }, () => isRefresh && this.reportRef.reportStatisticsReportGetData(report.id, report.dimensionId))}