Merge remote-tracking branch 'origin/developerA' into developerA

src/main/resources/templates/encyclopedia/instrument-detail.html

@@ -69,7 +69,7 @@
         </div>
     </section>
     <!-- 仪器优点 -->
-    <section class="section">
+    <section class="section" th:if="*{advantage != ''}">
         <div class="title">
             <h2>仪器优点</h2>
             <div class="line"></div>
@@ -77,7 +77,7 @@
         <div class="content" th:utext="*{advantage}"></div>
     </section>
     <!-- 仪器缺点 -->
-    <section class="section">
+    <section class="section" th:if="*{disadvantage != ''}">
         <div class="title">
             <h2>仪器缺点</h2>
             <div class="line"></div>
@@ -85,7 +85,7 @@
         <div class="content" th:utext="*{disadvantage}"></div>
     </section>
     <!-- 仪器原理 -->
-    <section class="section">
+    <section class="section" th:if="*{principle != ''}">
         <div class="title">
             <h2>仪器原理</h2>
             <div class="line"></div>
@@ -132,7 +132,7 @@
         </div>
     </section>
     <!-- 仪器认证 -->
-    <section class="section approve">
+    <section class="section approve" th:unless="*{#arrays.isEmpty(authImageList)}">
         <div class="title">
             <h2>仪器认证</h2>
             <div class="line"></div>
@@ -145,7 +145,7 @@
         </div>
     </section>
     <!-- 适应人群 -->
-    <section class="section">
+    <section class="section" th:if="*{adaptiveMan != ''}">
         <div class="title">
             <h2>适应人群</h2>
             <div class="line"></div>
@@ -153,7 +153,7 @@
         <div class="content" th:utext="*{adaptiveMan}"></div>
     </section>
     <!-- 不适应人群 -->
-    <section class="section">
+    <section class="section" th:if="*{unAdaptiveMan != ''}">
         <div class="title">
             <h2>不适应人群</h2>
             <div class="line"></div>
@@ -161,7 +161,7 @@
         <div class="content" th:utext="*{unAdaptiveMan}"></div>
     </section>
     <!-- 术前术后 -->
-    <section class="section">
+    <section class="section" th:if="*{aroundOperation != ''}">
         <div class="title">
             <h2>术前术后</h2>
             <div class="line"></div>
@@ -169,7 +169,7 @@
         <div class="content" th:utext="*{aroundOperation}"></div>
     </section>
     <!-- 效果展示 -->
-    <section class="section effect">
+    <section class="section effect" th:unless="*{#arrays.isEmpty(displayImageList)}">
         <div class="title">
             <h2>效果展示</h2>
             <div class="line"></div>
@@ -179,7 +179,7 @@
         </div>
     </section>
     <!-- 常见问题 -->
-    <section class="section question">
+    <section class="section question" th:unless="*{#arrays.isEmpty(questionList)}">
         <div class="title">
             <h2>常见问题</h2>
             <div class="line"></div>

src/main/resources/templates/encyclopedia/product-detail.html

@@ -54,7 +54,7 @@
         </div>
     </section>
     <!-- 产品优点 -->
-    <section class="section">
+    <section class="section" th:if="*{advantage != ''}">
         <div class="title">
             <h2>产品优点</h2>
             <div class="line"></div>
@@ -62,7 +62,7 @@
         <div class="content" th:utext="*{advantage}"></div>
     </section>
     <!-- 产品缺点 -->
-    <section class="section">
+    <section class="section" th:if="*{disadvantage != ''}">
         <div class="title">
             <h2>产品缺点</h2>
             <div class="line"></div>
@@ -70,7 +70,7 @@
         <div class="content" th:utext="*{disadvantage}"></div>
     </section>
     <!-- 产品原理 -->
-    <section class="section">
+    <section class="section" th:if="*{principle != ''}">
         <div class="title">
             <h2>产品原理</h2>
             <div class="line"></div>
@@ -97,7 +97,7 @@
             <div class="tr">
                 <div class="group">
                     <div class="th">上市时间</div>
-                    <div class="td" th:text="*{dates}"></div>
+                    <div class="td" th:text="*{marketTime}"></div>
                 </div>
                 <div class="group">
                     <div class="th">供应商</div>
@@ -107,7 +107,7 @@
             <div class="tr">
                 <div class="group">
                     <div class="th">NMPA认证时间</div>
-                    <div class="td" th:text="*{dates}"></div>
+                    <div class="td" th:text="*{nmpaTime}"></div>
                 </div>
                 <div class="group">
                     <div class="th">价格区间</div>
@@ -117,7 +117,7 @@
         </div>
     </section>
     <!-- 产品认证 -->
-    <section class="section approve">
+    <section class="section approve" th:unless="*{#arrays.isEmpty(authImageList)}">
         <div class="title">
             <h2>产品认证</h2>
             <div class="line"></div>
@@ -130,7 +130,7 @@
         </div>
     </section>
     <!-- 适应人群 -->
-    <section class="section">
+    <section class="section" th:if="*{ adaptiveMan != '' }">
         <div class="title">
             <h2>适应症</h2>
             <div class="line"></div>
@@ -138,7 +138,7 @@
         <div class="content" th:utext="*{adaptiveMan}"></div>
     </section>
     <!-- 不适应人群 -->
-    <section class="section">
+    <section class="section" th:if="*{ unAdaptiveMan != '' }">
         <div class="title">
             <h2>不适应人群</h2>
             <div class="line"></div>
@@ -146,7 +146,7 @@
         <div class="content" th:utext="*{unAdaptiveMan}"></div>
     </section>
     <!-- 术前术后 -->
-    <section class="section">
+    <section class="section" th:if="*{ aroundOperation != '' }">
         <div class="title">
             <h2>注意事项</h2>
             <div class="line"></div>
@@ -165,7 +165,7 @@
     </section>
     -->
     <!-- 常见问题 -->
-    <section class="section question">
+    <section class="section question" th:unless="*{#arrays.isEmpty(questionList)}">
         <div class="title">
             <h2>常见问题</h2>
             <div class="line"></div>