From a58da11dc339be3dc80da46c1b9cb8db31a0d6a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Wed, 20 Sep 2023 14:20:51 +0800
Subject: [PATCH] hotfix/2.9.42309.01 20230920

---
 .../payroll/templatePreview/computerTemplate/index.js    | 2 +-
 .../pages/payroll/templatePreview/phoneTemplate/index.js | 2 +-
 .../pages/payrollFiles/components/allWithoutPay.js       | 9 +++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/payroll/templatePreview/computerTemplate/index.js b/pc4mobx/hrmSalary/pages/payroll/templatePreview/computerTemplate/index.js
index 8bcb6aa8..aeb6db18 100644
--- a/pc4mobx/hrmSalary/pages/payroll/templatePreview/computerTemplate/index.js
+++ b/pc4mobx/hrmSalary/pages/payroll/templatePreview/computerTemplate/index.js
@@ -94,7 +94,7 @@ export default class ComputerTemplate extends React.Component {
         <div className="sobItemWrapper">
           {
             salaryItemSet.length > 0 &&
-            salaryItemSet.map((group, index) => {
+            _.filter(salaryItemSet, it => (!_.isNil(it) && !_.isEmpty(it))).map((group, index) => {
               return <div className="sobItem">
                 <div className="descript-title">{group.groupName}</div>
                 <div className="descriptions-view">
diff --git a/pc4mobx/hrmSalary/pages/payroll/templatePreview/phoneTemplate/index.js b/pc4mobx/hrmSalary/pages/payroll/templatePreview/phoneTemplate/index.js
index 01730ef7..67c1ebef 100644
--- a/pc4mobx/hrmSalary/pages/payroll/templatePreview/phoneTemplate/index.js
+++ b/pc4mobx/hrmSalary/pages/payroll/templatePreview/phoneTemplate/index.js
@@ -75,7 +75,7 @@ export default class PhoneTemplate extends React.Component {
         <div className="sobItemWrapper">
           {
             salaryItemSet.length > 0 &&
-            salaryItemSet.map((group, index) => (
+            _.filter(salaryItemSet, it => (!_.isNil(it) && !_.isEmpty(it))).map((group, index) => (
               <div className="sobItem">
                 <div className="descript-title">{group.groupName}</div>
                 <div className="descriptions-view">
diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/components/allWithoutPay.js b/pc4mobx/hrmSalary/pages/payrollFiles/components/allWithoutPay.js
index c9d85ff8..5b2ca302 100644
--- a/pc4mobx/hrmSalary/pages/payrollFiles/components/allWithoutPay.js
+++ b/pc4mobx/hrmSalary/pages/payrollFiles/components/allWithoutPay.js
@@ -11,15 +11,16 @@ class AllWithoutPay extends Component {
         message.warning("未选择条目");
         return;
       }
-      API.gotoStop(selectedRowKeys).then(({ status, errormsg }) => {
+      API.gotoStop(selectedRowKeys).then(({ status, data, errormsg }) => {
         if (status) {
-          message.success("操作成功!");
+          const { msg } = data;
+          message.info(msg || "操作成功!");
           refreshList();
         } else {
           message.error(errormsg || "操作失败!");
         }
       });
-    }else{
+    } else {
       const { pageInfo } = this.props;
       if (pageInfo.total === 0) {
         message.warning("您没有需要处理的待停薪人员！");
@@ -31,7 +32,7 @@ class AllWithoutPay extends Component {
         onOk: () => {
           API.allGotoStop({}).then(({ status, data, errormsg }) => {
             if (status) {
-              const { msg }= data;
+              const { msg } = data;
               message.info(msg || "操作成功!");
               refreshList();
             } else {