From b1eac79e832a1101028d5f09631fc840aa5d7897 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 27 Feb 2020 09:59:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../react/src/modules/tpm/TPMsettings/Shixuninformation.js  | 6 +++---
 public/react/src/modules/tpm/newshixuns/Newshixuns.js       | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/public/react/src/modules/tpm/TPMsettings/Shixuninformation.js b/public/react/src/modules/tpm/TPMsettings/Shixuninformation.js
index 6697ee47c..f98baaa09 100644
--- a/public/react/src/modules/tpm/TPMsettings/Shixuninformation.js
+++ b/public/react/src/modules/tpm/TPMsettings/Shixuninformation.js
@@ -953,9 +953,9 @@ class Shixuninformation extends Component {
                       <div>
                            {this.state.mainvalues === undefined && this.state.subvalues === undefined || this.state.mainvalues === "" && this.state.subvalues === "" ? "" :
                              <div className={"font-12"} style={{'max-width': '600px'}}>
-                               {`${this.state.mainvalues === undefined || this.state.mainvalues === "" ? "" : this.state.mainvalues}`}
-                               {`${this.state.subvalues === undefined || this.state.subvalues === "" ? "" : this.state.mainvalues === undefined || this.state.mainvalues === "" ? this.state.subvalues : this.state.subvalues}`}
-                               {`${this.state.mainvalues === undefined || this.state.mainvalues === "" ? "" :  this.state.mainvalues}${this.state.subvalues === undefined || this.state.subvalues === "" ? "" :
+                              {`${this.state.mainvalues === undefined || this.state.mainvalues === "" ? "" : this.state.mainvalues}`}
+                              {`${this.state.subvalues === undefined || this.state.subvalues === "" ? "" : this.state.mainvalues === undefined || this.state.mainvalues === "" ? this.state.subvalues : this.state.subvalues}`}
+                              {`${this.state.mainvalues === undefined || this.state.mainvalues === "" ? "" :  ""}${this.state.subvalues === undefined || this.state.subvalues === "" ? "" :
                                  this.state.mainvalues === undefined || this.state.mainvalues === "" ? this.state.subvalues : this.state.subvalues}`}
                              </div>}
                       </div>
diff --git a/public/react/src/modules/tpm/newshixuns/Newshixuns.js b/public/react/src/modules/tpm/newshixuns/Newshixuns.js
index 361ed3248..d017fe2aa 100644
--- a/public/react/src/modules/tpm/newshixuns/Newshixuns.js
+++ b/public/react/src/modules/tpm/newshixuns/Newshixuns.js
@@ -620,9 +620,9 @@ class Newshixuns extends Component {
                               <div>
                                 {this.state.mainvalues === undefined && this.state.subvalues === undefined || this.state.mainvalues === "" && this.state.subvalues === "" ? "" :
                                   <div className={"font-12"} style={{'max-width': '600px'}}>
-                                    {`${this.state.mainvalues === undefined || this.state.mainvalues === "" ? "" : this.state.mainvalues}`}
+                                   {`${this.state.mainvalues === undefined || this.state.mainvalues === "" ? "" : this.state.mainvalues}`}
                                     {`${this.state.subvalues === undefined || this.state.subvalues === "" ? "" : this.state.mainvalues === undefined || this.state.mainvalues === "" ?  this.state.subvalues : this.state.subvalues}`}
-                                    {`${this.state.mainvalues === undefined || this.state.mainvalues === "" ? "" :   this.state.mainvalues}${this.state.subvalues === undefined || this.state.subvalues === "" ? "" :
+                                    {`${this.state.mainvalues === undefined || this.state.mainvalues === "" ? "" :  ""}${this.state.subvalues === undefined || this.state.subvalues === "" ? "" :
                                       this.state.mainvalues === undefined || this.state.mainvalues === "" ?  this.state.subvalues : this.state.subvalues}`}
                                   </div>}