From 41a6afdb40e42172ec7e70768bade2ff005d5ab3 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Mon, 31 Mar 2025 16:11:37 +0800
Subject: [PATCH 1/2] =?UTF-8?q?release/2.19.1.2501.01-=E4=B8=AA=E7=A8=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
index 4c579f2c..6054413f 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
@@ -336,7 +336,7 @@ class Index extends Component {
     const { addAllLoading, incomeTaxStatus } = this.state;
     const commonBtns = [
       <Button type="primary" onClick={this.handleOpenImport}>导入</Button>,
-      <Button type="ghost" onClick={this.handleOnlineAccess}>{getLabel(111, "在线获取")}</Button>,
+      // <Button type="ghost" onClick={this.handleOnlineAccess}>{getLabel(111, "在线获取")}</Button>,
       <Button type="ghost" onClick={() => this.handleAddData()}>新建</Button>,
       <Dropdown
         overlay={

From cfe8117bbf1c90fbdb510b4bf3c67e252b79b99f Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Tue, 1 Apr 2025 11:28:41 +0800
Subject: [PATCH 2/2] =?UTF-8?q?release/2.19.1.2501.01-=E4=B8=AA=E7=A8=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pc4mobx/hrmSalary/pages/declareOnlineComparison/index.js b/pc4mobx/hrmSalary/pages/declareOnlineComparison/index.js
index 9a5b9560..71ae95c5 100644
--- a/pc4mobx/hrmSalary/pages/declareOnlineComparison/index.js
+++ b/pc4mobx/hrmSalary/pages/declareOnlineComparison/index.js
@@ -67,6 +67,7 @@ class Index extends Component {
     return _.map(_.filter(toJS(declareTableStore.columns), (item) => (item.display === "true" && showColumns.includes(item["dataIndex"]))), o => ({
       dataIndex: o.dataIndex, title: o.title, width: 150,
       render: (text, record) => {
+        if (!record[o["dataIndex"]]) return <span/>;
         return Object.prototype.toString.call(record[o["dataIndex"]]) === "[object String]" ? <span>{text}</span> :
           <div className="comparison-column-item-container">
             <div className="comparison-single-row">