From f017300e3063e867d0ca88a589274f23dec836fc Mon Sep 17 00:00:00 2001
From: LiuJiaNan <15703339975@163.com>
Date: Wed, 15 Apr 2026 13:54:19 +0800
Subject: [PATCH] bug15680

---
 .../UserExchangeList/index.js                 | 67 ++++++-------------
 .../UserExchangeRecordList/index.js           |  2 +-
 2 files changed, 21 insertions(+), 48 deletions(-)

diff --git a/src/pages/Container/Supervision/PersonnelEvaluation/UserExchangeList/index.js b/src/pages/Container/Supervision/PersonnelEvaluation/UserExchangeList/index.js
index 3e44a88..9c5a0b6 100644
--- a/src/pages/Container/Supervision/PersonnelEvaluation/UserExchangeList/index.js
+++ b/src/pages/Container/Supervision/PersonnelEvaluation/UserExchangeList/index.js
@@ -154,53 +154,26 @@ function UserExchangeList(props) {
               fixed: "right",
               render: (_, record) => (
                 <Space>
-                  {
-                    props.entrance === "enterprise"
-                      ? (
-                          <>
-                            {props.permission("qyd-rykpgl-exchange-info") && (
-                              <Button
-                                type="link"
-                                onClick={() => {
-                                  props.history.push(`./userExchangeRecordList?userId=${record.userId}&corpinfoId=${query.corpinfoId}`);
-                                }}
-                              >
-                                兑换记录
-                              </Button>
-                            )}
-                            {props.permission("qyd-rykpgl-eval-record") && (
-                              <Button
-                                type="link"
-                                onClick={() => {
-                                  props.history.push(`./hiddenEvaluationList?userId=${record.userId}&corpinfoId=${query.corpinfoId}`);
-                                }}
-                              >
-                                考评详情
-                              </Button>
-                            )}
-                          </>
-                        )
-                      : (
-                          <>
-                            <Button
-                              type="link"
-                              onClick={() => {
-                                props.history.push(`./userExchangeRecordList?userId=${record.userId}&corpinfoId=${query.corpinfoId}`);
-                              }}
-                            >
-                              兑换记录
-                            </Button>
-                            <Button
-                              type="link"
-                              onClick={() => {
-                                props.history.push(`./hiddenEvaluationList?userId=${record.userId}&corpinfoId=${query.corpinfoId}`);
-                              }}
-                            >
-                              考评详情
-                            </Button>
-                          </>
-                        )
-                  }
+                  {(props.entrance === "enterprise" || props.permission("qyd-rykpgl-exchange-info")) && (
+                    <Button
+                      type="link"
+                      onClick={() => {
+                        props.history.push(`./userExchangeRecordList?userId=${record.userId}&corpinfoId=${query.corpinfoId || ""}`);
+                      }}
+                    >
+                      兑换记录
+                    </Button>
+                  )}
+                  {(props.entrance === "enterprise" || props.permission("qyd-rykpgl-eval-record")) && (
+                    <Button
+                      type="link"
+                      onClick={() => {
+                        props.history.push(`./hiddenEvaluationList?userId=${record.userId}&corpinfoId=${query.corpinfoId || ""}`);
+                      }}
+                    >
+                      考评详情
+                    </Button>
+                  )}
                 </Space>
               ),
             },
diff --git a/src/pages/Container/Supervision/PersonnelEvaluation/UserExchangeRecordList/index.js b/src/pages/Container/Supervision/PersonnelEvaluation/UserExchangeRecordList/index.js
index 25cba03..844db3f 100644
--- a/src/pages/Container/Supervision/PersonnelEvaluation/UserExchangeRecordList/index.js
+++ b/src/pages/Container/Supervision/PersonnelEvaluation/UserExchangeRecordList/index.js
@@ -47,7 +47,7 @@ function UserExchangeRecordList(props) {
                 <Button
                   type="link"
                   onClick={() => {
-                    props.history.push(`./hiddenExchangeList?hiddenExchangeBathId=${record.hiddenExchangeBathId}&corpinfoId=${query.corpinfoId}`);
+                    props.history.push(`./hiddenExchangeList?hiddenExchangeBathId=${record.hiddenExchangeBathId}&corpinfoId=${query.corpinfoId || ""}`);
                   }}
                 >
                   隐患详情