From 3ba432960055b195bff2c289c97225723dfcc282 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Tue, 4 Jun 2024 13:42:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/static/portal/css/index.css     |   4 +-
 .../src/main/resources/templates/login.html   |  27 +++---
 .../resources/templates/news/news/edit.html   |   2 +-
 .../templates/portal/headerAndFooter.html     |   3 +-
 .../resources/templates/portal/index.html     |  11 +--
 .../main/resources/templates/portal/list.html |  77 ++++++++++--------
 .../templates/portal/searchList.html          |   2 +-
 .../classes/static/portal/css/index.css       |   4 +-
 .../target/classes/templates/login.html       |  27 +++---
 .../classes/templates/news/news/edit.html     |   2 +-
 .../templates/portal/headerAndFooter.html     |   3 +-
 .../classes/templates/portal/index.html       |  11 +--
 .../target/classes/templates/portal/list.html |  77 ++++++++++--------
 .../classes/templates/portal/searchList.html  |   2 +-
 .../com/ruoyi/common/utils/StringUtils.java   |   3 +-
 .../com/ruoyi/common/utils/StringUtils.class  | Bin 10153 -> 10155 bytes
 16 files changed, 138 insertions(+), 117 deletions(-)

diff --git a/blxc-admin/src/main/resources/static/portal/css/index.css b/blxc-admin/src/main/resources/static/portal/css/index.css
index f99a113..fb4d6ea 100644
--- a/blxc-admin/src/main/resources/static/portal/css/index.css
+++ b/blxc-admin/src/main/resources/static/portal/css/index.css
@@ -2412,7 +2412,7 @@ html {
 .homef .home-footer .fright .frightb {
 	border-top: .04rem solid #365faa;
 	height: 2.72rem;
-	padding: 0 10.25% 0 7.3%;
+	padding: 0 5.25% 0 3.3%;
 	line-height: 2.72rem
 }
 
@@ -3037,7 +3037,7 @@ li.A_li9:hover p {
 
 .index-flash .list li {
 	position: relative;
-	height: 32.1rem;
+	height: 31.1rem;
 }
 
 .index-flash .list li .img {
diff --git a/blxc-admin/src/main/resources/templates/login.html b/blxc-admin/src/main/resources/templates/login.html
index 8cb0c4f..65d96ff 100644
--- a/blxc-admin/src/main/resources/templates/login.html
+++ b/blxc-admin/src/main/resources/templates/login.html
@@ -29,14 +29,14 @@
                         <h1><img alt="[ 吉林省新农科长白山创新学院 ]" src="../static/ruoyi.png" th:src="@{/ruoyi.png}"></h1>
                     </div>
                     <div class="m-b"></div>
-                    <h4>欢迎使用 <strong>后台管理系统</strong></h4>
+                    <h4>欢迎使用 <strong>长白山创新学院</strong> 后台管理系统</h4>
                 </div>
             </div>
             <div class="col-sm-5">
                 <form id="signupForm" autocomplete="off">
                     <h4 class="no-margins">登录：</h4>
-                    <input type="text"     name="username" class="form-control uname"     placeholder="用户名" value="admin" />
-                    <input type="password" name="password" class="form-control pword"     placeholder="密码"   value="admin" />
+                    <input type="text"     name="username" class="form-control uname"     placeholder="用户名"  />
+                    <input type="password" name="password" class="form-control pword"     placeholder="密码"    />
 					<div class="row m-t" th:if="${captchaEnabled==true}">
 						<div class="col-xs-6">
 						    <input type="text" name="validateCode" class="form-control code" placeholder="验证码" maxlength="5" />
@@ -47,20 +47,23 @@
 							</a>
 						</div>
 					</div>
-                    <div class="checkbox-custom" th:if="${isRemembered}" th:classappend="${captchaEnabled==false} ? 'm-t'">
-				        <input type="checkbox" id="rememberme" name="rememberme"> <label for="rememberme">记住我</label>
-				    </div>
+<!--                    <div class="checkbox-custom" th:if="${isRemembered}" th:classappend="${captchaEnabled==false} ? 'm-t'">-->
+<!--				        <input type="checkbox" id="rememberme" name="rememberme"> <label for="rememberme">记住我</label>-->
+<!--				    </div>-->
                     <button class="btn btn-success btn-block" id="btnSubmit" data-loading="正在验证登录，请稍候...">登录</button>
                 </form>
             </div>
         </div>
-        <div class="signup-footer">
-            <div class="pull-left">
-                Copyright © 吉林省新农科长白山创新学院. <br>
-            </div>
-        </div>
+<!--        <div class="signup-footer">-->
+<!--            <div class="pull-center">-->
+<!--                Copyright © 吉林省新农科长白山创新学院. <br>-->
+<!--            </div>-->
+<!--        </div>-->
     </div>
-<script th:inline="javascript"> var ctx = [[@{/}]]; var captchaType = [[${captchaType}]]; var captchaEnabled = [[${captchaEnabled}]];</script>
+<script th:inline="javascript">
+    var ctx = [[@{/}]];
+    var captchaType = [[${captchaType}]];
+    var captchaEnabled = [[${captchaEnabled}]];</script>
 <!--[if lte IE 8]><script>window.location.href=ctx+'html/ie.html';</script><![endif]-->
 <!-- 全局js -->
 <script src="../static/js/jquery.min.js" th:src="@{/js/jquery.min.js}"></script>
diff --git a/blxc-admin/src/main/resources/templates/news/news/edit.html b/blxc-admin/src/main/resources/templates/news/news/edit.html
index 99d3982..018d3cb 100644
--- a/blxc-admin/src/main/resources/templates/news/news/edit.html
+++ b/blxc-admin/src/main/resources/templates/news/news/edit.html
@@ -89,7 +89,7 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label">附件：</label>
                 <div class="col-sm-8">
-                    <input type="text" name="filePath" th:field="*{filePath}">
+                    <input type="hidden" name="filePath" th:field="*{filePath}">
                     <div class="file-loading">
                         <input class="form-control file-uploadb" id="filePath" name="file" type="file" accept="*" multiple>
                     </div>
diff --git a/blxc-admin/src/main/resources/templates/portal/headerAndFooter.html b/blxc-admin/src/main/resources/templates/portal/headerAndFooter.html
index 121d030..362ee05 100644
--- a/blxc-admin/src/main/resources/templates/portal/headerAndFooter.html
+++ b/blxc-admin/src/main/resources/templates/portal/headerAndFooter.html
@@ -227,8 +227,9 @@
 				</div>
 				<div class="frightb">
 					<div class="flex-left">
-						<div class="ll flex-v-center">友情链接：</div>
+<!--						<div class="ll flex-v-center">友情链接</div>-->
 						<div class="rr">
+							<a th:href="'/portal/list?newType=13'">友情链接：</a>
 							<a th:each="item:${yqljList}" th:href="${item.linkUrl}" target="_blank"><span class="titline_w">[[${item.title}]]</span></a>
 <!--							<a href="list.html" title="吉林农业大学"-->
 <!--							   onclick="_addDynClicks('&#34;wbimage&#34;', 1729783378, 79045)" target="_blank"-->
diff --git a/blxc-admin/src/main/resources/templates/portal/index.html b/blxc-admin/src/main/resources/templates/portal/index.html
index 423c7d4..95e5954 100644
--- a/blxc-admin/src/main/resources/templates/portal/index.html
+++ b/blxc-admin/src/main/resources/templates/portal/index.html
@@ -68,7 +68,7 @@
                                 </div>
                                 <ul style="margin-top: .65rem;">
                                     <li class="titlin_b" th:each="item : ${xwdtList}" >
-                                        <a th:href="${item.linkUrl}?${item.linkUrl}:'/portal/details?id='+${item.id}" target="_blank" th:title="${item.title}" class="ellipsis-multiline">
+                                        <a th:href="${item.type=='2'}?${item.linkUrl}:'/portal/details?id='+${item.id}" target="_blank" th:title="${item.title}" class="ellipsis-multiline">
                                             <h4 class="titline_b">[[${item.title}]]</h4>
                                             <p class="titline_line2" >
                                                 [[${item.abstracts}]]
@@ -86,12 +86,12 @@
                                 <div class="swiper-wrapper">
                                     <div class="swiper-slide slide bg-mask"  th:each="item : ${xwdtList}" >
                                         <div class="pic">
-                                            <a th:href="${item.linkUrl}?${item.linkUrl}:'/portal/details?id='+${item.id}" target="_blank" th:title="${item.title}" class="mark">
+                                            <a th:href="${item.type=='2'}?${item.linkUrl}:'/portal/details?id='+${item.id}" target="_blank" th:title="${item.title}" class="mark">
                                                 <img  th:src="${item.imagePath}" th:alt="${item.title}" style="max-width:875px;max-height:599px;" />
                                             </a>
                                         </div>
                                         <p>
-                                            <a th:href="${item.linkUrl}?${item.linkUrl}:'/portal/details?id='+${item.id}" target="_blank" th:title="${item.title}" class="texto">
+                                            <a th:href="${item.type=='2'}?${item.linkUrl}:'/portal/details?id='+${item.id}" target="_blank" th:title="${item.title}" class="texto">
                                                 [[${item.title}]]
                                             </a>
                                             <span>发布时间：[[${#dates.format(item.publishTime, 'YYYY-MM-dd')}]]</span>
@@ -150,7 +150,8 @@
                                 <time><span>[[${#dates.format(item.publishTime, 'dd')}]]</span>[[${#dates.format(item.publishTime, 'YYYY-MM')}]]</time>
                             </div>
                             <div class="info flex-v-center">
-                                <h4><a th:href="${item.linkUrl}?${item.linkUrl}:'/portal/details?id='+${item.id}" target="_blank" th:title="${item.title}" class="texto">
+                                <h4>
+                                    <a th:href="${item.type=='2'}?${item.linkUrl}:'/portal/details?id='+${item.id}" target="_blank" th:title="${item.title}" class="texto">
                                     <span class="titline_w">[[${item.title}]]</span></a>
                                 </h4>
                                 <p class="line2">
@@ -174,7 +175,7 @@
                                     <ul>
                                         <li th:each="item : ${hdygList}">
                                             <div class="img">
-                                                <a th:href="${item.linkUrl}?${item.linkUrl}:'/portal/details?id='+${item.id}" target="_blank" th:title="${item.title}"  class="jtfylist jtfyl1">
+                                                <a th:href="${item.type=='2'}?${item.linkUrl}:'/portal/details?id='+${item.id}" target="_blank" th:title="${item.title}"  class="jtfylist jtfyl1">
                                                     <img th:src="${item.imagePath}" th:alt="${item.title}" style="width: 100%" />
                                                 </a>
                                             </div>
diff --git a/blxc-admin/src/main/resources/templates/portal/list.html b/blxc-admin/src/main/resources/templates/portal/list.html
index c35e47e..f088bbb 100644
--- a/blxc-admin/src/main/resources/templates/portal/list.html
+++ b/blxc-admin/src/main/resources/templates/portal/list.html
@@ -81,7 +81,6 @@
 <th:block th:include="portal/headerAndFooter :: search" />
 
 <script src="../../static/js/public.js" th:src="@{/portal/js/public.js}"></script>
-<script th:src="@{/portal/js/page.js}"></script>
 <script  th:inline="javascript">
 
     var newType = [[${threeCode}]]
@@ -94,7 +93,7 @@
     let str = result.rows.reduce(function (prve, item) {
     //                    <a href="/portal/details?id=${item.id}" target="_blank" title="${item.title}" class="clearfix">
     var url = "";
-    if(item.linkUrl){
+    if(item.type=='2'){
     url = item.linkUrl;
     }else{
     url= '/portal/details?id='+item.id
@@ -103,9 +102,14 @@
                 <li class="clearfix">
                     <a  href="${url}" target="_blank" title="${item.title}" class="clearfix">
                         <div class="left txt">
-                            <div class="fnt_22 title">${item.title}</div>
-                            <div class="des">${item.abstracts}</div>
-                        </div>
+                            <div class="fnt_22 title">${item.title}</div>`
+    if(item.abstracts){
+        prve +=`<div class="des">${item.abstracts}</div>`
+    }else{
+        prve +=`<div class="des"> </div>`
+    }
+
+    prve +=`</div>
                         <div class="right time">
                             <div class="ta">${item.publishTime}</div>
                             <div>发布时间</div>
@@ -130,13 +134,13 @@
     });
 
     async function mainListChange(page) {
-        var url = "/portal/dataList";
-        var div = document.getElementById("dataSource");
-        var dataParam = {newType:newType,pageNum: page, pageSize: 10}
-        $.post(url, dataParam, function(result) {
+    var url = "/portal/dataList";
+    var div = document.getElementById("dataSource");
+    var dataParam = {newType:newType,pageNum: page, pageSize: 10}
+    $.post(url, dataParam, function(result) {
 
-            let str = result.rows.reduce(function (prve, item) {
-            prve += `
+    let str = result.rows.reduce(function (prve, item) {
+    prve += `
                         <li class="clearfix">
                             <a href="/portal/details?id=${item.id}" target="_blank" title="2023-2024秋 本科生第二次游泳集中测试通知" class="clearfix">
                                 <div class="left txt">
@@ -150,13 +154,13 @@
                             </a>
                         </li>
                     `
-            return prve
-            }, '')
-            document.querySelector('.dataSource').innerHTML = str;
+    return prve
+    }, '')
+    document.querySelector('.dataSource').innerHTML = str;
 
-            //翻页
-            generPage(result.total, 'page_list')
-        });
+    //翻页
+    generPage(result.total, 'page_list')
+    });
     }
 
 
@@ -164,34 +168,35 @@
     //if($(window).width()<1024){
     //判断手机横竖屏状态：
     if (window.orientation == 180 || window.orientation == 0) {
-        //alert("竖屏状态！")
-        $(".stips").hide();
+    //alert("竖屏状态！")
+    $(".stips").hide();
     }
     if (window.orientation == 90 || window.orientation == -90) {
-        //alert("横屏状态！")
-        $(".stips").css({
-            display: "flex"
-        });
+    //alert("横屏状态！")
+    $(".stips").css({
+    display: "flex"
+    });
     }
 
     function hengshuping() {
-        if (window.orientation == 180 || window.orientation == 0) {
-            //alert("竖屏状态！")
-            $(".stips").hide();
-        }
-        if (window.orientation == 90 || window.orientation == -90) {
-            //alert("横屏状态！")
-            $(".stips").css({
-                display: "flex"
-            });
-        }
+    if (window.orientation == 180 || window.orientation == 0) {
+    //alert("竖屏状态！")
+    $(".stips").hide();
+    }
+    if (window.orientation == 90 || window.orientation == -90) {
+    //alert("横屏状态！")
+    $(".stips").css({
+    display: "flex"
+    });
+    }
     }
     //}
     window.addEventListener(
-        "onorientationchange" in window ? "orientationchange" : "resize",
-        hengshuping,
-        false
+    "onorientationchange" in window ? "orientationchange" : "resize",
+    hengshuping,
+    false
     );
 </script>
+<script th:src="@{/portal/js/page.js}"></script>
 </body>
 </html>
diff --git a/blxc-admin/src/main/resources/templates/portal/searchList.html b/blxc-admin/src/main/resources/templates/portal/searchList.html
index dcf7489..0308986 100644
--- a/blxc-admin/src/main/resources/templates/portal/searchList.html
+++ b/blxc-admin/src/main/resources/templates/portal/searchList.html
@@ -39,7 +39,7 @@
 
                         <ul class="dataSource" style="min-height:600px">
                             <li class="clearfix" th:each="item : ${list}">
-                                <a th:href="${item.linkUrl}?${item.linkUrl}:'/portal/details?id='+${item.id}" target="_blank" th:title="${item.title}" class="clearfix">
+                                <a th:href="${item.type=='2'}?${item.linkUrl}:'/portal/details?id='+${item.id}" target="_blank" th:title="${item.title}" class="clearfix">
                                     <div class="left txt">
                                         <div class="fnt_22 title">[[${item.title}]]</div>
                                         <div class="des">[[${item.abstracts}]]</div>
diff --git a/blxc-admin/target/classes/static/portal/css/index.css b/blxc-admin/target/classes/static/portal/css/index.css
index f99a113..fb4d6ea 100644
--- a/blxc-admin/target/classes/static/portal/css/index.css
+++ b/blxc-admin/target/classes/static/portal/css/index.css
@@ -2412,7 +2412,7 @@ html {
 .homef .home-footer .fright .frightb {
 	border-top: .04rem solid #365faa;
 	height: 2.72rem;
-	padding: 0 10.25% 0 7.3%;
+	padding: 0 5.25% 0 3.3%;
 	line-height: 2.72rem
 }
 
@@ -3037,7 +3037,7 @@ li.A_li9:hover p {
 
 .index-flash .list li {
 	position: relative;
-	height: 32.1rem;
+	height: 31.1rem;
 }
 
 .index-flash .list li .img {
diff --git a/blxc-admin/target/classes/templates/login.html b/blxc-admin/target/classes/templates/login.html
index 8cb0c4f..65d96ff 100644
--- a/blxc-admin/target/classes/templates/login.html
+++ b/blxc-admin/target/classes/templates/login.html
@@ -29,14 +29,14 @@
                         <h1><img alt="[ 吉林省新农科长白山创新学院 ]" src="../static/ruoyi.png" th:src="@{/ruoyi.png}"></h1>
                     </div>
                     <div class="m-b"></div>
-                    <h4>欢迎使用 <strong>后台管理系统</strong></h4>
+                    <h4>欢迎使用 <strong>长白山创新学院</strong> 后台管理系统</h4>
                 </div>
             </div>
             <div class="col-sm-5">
                 <form id="signupForm" autocomplete="off">
                     <h4 class="no-margins">登录：</h4>
-                    <input type="text"     name="username" class="form-control uname"     placeholder="用户名" value="admin" />
-                    <input type="password" name="password" class="form-control pword"     placeholder="密码"   value="admin" />
+                    <input type="text"     name="username" class="form-control uname"     placeholder="用户名"  />
+                    <input type="password" name="password" class="form-control pword"     placeholder="密码"    />
 					<div class="row m-t" th:if="${captchaEnabled==true}">
 						<div class="col-xs-6">
 						    <input type="text" name="validateCode" class="form-control code" placeholder="验证码" maxlength="5" />
@@ -47,20 +47,23 @@
 							</a>
 						</div>
 					</div>
-                    <div class="checkbox-custom" th:if="${isRemembered}" th:classappend="${captchaEnabled==false} ? 'm-t'">
-				        <input type="checkbox" id="rememberme" name="rememberme"> <label for="rememberme">记住我</label>
-				    </div>
+<!--                    <div class="checkbox-custom" th:if="${isRemembered}" th:classappend="${captchaEnabled==false} ? 'm-t'">-->
+<!--				        <input type="checkbox" id="rememberme" name="rememberme"> <label for="rememberme">记住我</label>-->
+<!--				    </div>-->
                     <button class="btn btn-success btn-block" id="btnSubmit" data-loading="正在验证登录，请稍候...">登录</button>
                 </form>
             </div>
         </div>
-        <div class="signup-footer">
-            <div class="pull-left">
-                Copyright © 吉林省新农科长白山创新学院. <br>
-            </div>
-        </div>
+<!--        <div class="signup-footer">-->
+<!--            <div class="pull-center">-->
+<!--                Copyright © 吉林省新农科长白山创新学院. <br>-->
+<!--            </div>-->
+<!--        </div>-->
     </div>
-<script th:inline="javascript"> var ctx = [[@{/}]]; var captchaType = [[${captchaType}]]; var captchaEnabled = [[${captchaEnabled}]];</script>
+<script th:inline="javascript">
+    var ctx = [[@{/}]];
+    var captchaType = [[${captchaType}]];
+    var captchaEnabled = [[${captchaEnabled}]];</script>
 <!--[if lte IE 8]><script>window.location.href=ctx+'html/ie.html';</script><![endif]-->
 <!-- 全局js -->
 <script src="../static/js/jquery.min.js" th:src="@{/js/jquery.min.js}"></script>
diff --git a/blxc-admin/target/classes/templates/news/news/edit.html b/blxc-admin/target/classes/templates/news/news/edit.html
index 99d3982..018d3cb 100644
--- a/blxc-admin/target/classes/templates/news/news/edit.html
+++ b/blxc-admin/target/classes/templates/news/news/edit.html
@@ -89,7 +89,7 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label">附件：</label>
                 <div class="col-sm-8">
-                    <input type="text" name="filePath" th:field="*{filePath}">
+                    <input type="hidden" name="filePath" th:field="*{filePath}">
                     <div class="file-loading">
                         <input class="form-control file-uploadb" id="filePath" name="file" type="file" accept="*" multiple>
                     </div>
diff --git a/blxc-admin/target/classes/templates/portal/headerAndFooter.html b/blxc-admin/target/classes/templates/portal/headerAndFooter.html
index 121d030..362ee05 100644
--- a/blxc-admin/target/classes/templates/portal/headerAndFooter.html
+++ b/blxc-admin/target/classes/templates/portal/headerAndFooter.html
@@ -227,8 +227,9 @@
 				</div>
 				<div class="frightb">
 					<div class="flex-left">
-						<div class="ll flex-v-center">友情链接：</div>
+<!--						<div class="ll flex-v-center">友情链接</div>-->
 						<div class="rr">
+							<a th:href="'/portal/list?newType=13'">友情链接：</a>
 							<a th:each="item:${yqljList}" th:href="${item.linkUrl}" target="_blank"><span class="titline_w">[[${item.title}]]</span></a>
 <!--							<a href="list.html" title="吉林农业大学"-->
 <!--							   onclick="_addDynClicks('&#34;wbimage&#34;', 1729783378, 79045)" target="_blank"-->
diff --git a/blxc-admin/target/classes/templates/portal/index.html b/blxc-admin/target/classes/templates/portal/index.html
index 423c7d4..95e5954 100644
--- a/blxc-admin/target/classes/templates/portal/index.html
+++ b/blxc-admin/target/classes/templates/portal/index.html
@@ -68,7 +68,7 @@
                                 </div>
                                 <ul style="margin-top: .65rem;">
                                     <li class="titlin_b" th:each="item : ${xwdtList}" >
-                                        <a th:href="${item.linkUrl}?${item.linkUrl}:'/portal/details?id='+${item.id}" target="_blank" th:title="${item.title}" class="ellipsis-multiline">
+                                        <a th:href="${item.type=='2'}?${item.linkUrl}:'/portal/details?id='+${item.id}" target="_blank" th:title="${item.title}" class="ellipsis-multiline">
                                             <h4 class="titline_b">[[${item.title}]]</h4>
                                             <p class="titline_line2" >
                                                 [[${item.abstracts}]]
@@ -86,12 +86,12 @@
                                 <div class="swiper-wrapper">
                                     <div class="swiper-slide slide bg-mask"  th:each="item : ${xwdtList}" >
                                         <div class="pic">
-                                            <a th:href="${item.linkUrl}?${item.linkUrl}:'/portal/details?id='+${item.id}" target="_blank" th:title="${item.title}" class="mark">
+                                            <a th:href="${item.type=='2'}?${item.linkUrl}:'/portal/details?id='+${item.id}" target="_blank" th:title="${item.title}" class="mark">
                                                 <img  th:src="${item.imagePath}" th:alt="${item.title}" style="max-width:875px;max-height:599px;" />
                                             </a>
                                         </div>
                                         <p>
-                                            <a th:href="${item.linkUrl}?${item.linkUrl}:'/portal/details?id='+${item.id}" target="_blank" th:title="${item.title}" class="texto">
+                                            <a th:href="${item.type=='2'}?${item.linkUrl}:'/portal/details?id='+${item.id}" target="_blank" th:title="${item.title}" class="texto">
                                                 [[${item.title}]]
                                             </a>
                                             <span>发布时间：[[${#dates.format(item.publishTime, 'YYYY-MM-dd')}]]</span>
@@ -150,7 +150,8 @@
                                 <time><span>[[${#dates.format(item.publishTime, 'dd')}]]</span>[[${#dates.format(item.publishTime, 'YYYY-MM')}]]</time>
                             </div>
                             <div class="info flex-v-center">
-                                <h4><a th:href="${item.linkUrl}?${item.linkUrl}:'/portal/details?id='+${item.id}" target="_blank" th:title="${item.title}" class="texto">
+                                <h4>
+                                    <a th:href="${item.type=='2'}?${item.linkUrl}:'/portal/details?id='+${item.id}" target="_blank" th:title="${item.title}" class="texto">
                                     <span class="titline_w">[[${item.title}]]</span></a>
                                 </h4>
                                 <p class="line2">
@@ -174,7 +175,7 @@
                                     <ul>
                                         <li th:each="item : ${hdygList}">
                                             <div class="img">
-                                                <a th:href="${item.linkUrl}?${item.linkUrl}:'/portal/details?id='+${item.id}" target="_blank" th:title="${item.title}"  class="jtfylist jtfyl1">
+                                                <a th:href="${item.type=='2'}?${item.linkUrl}:'/portal/details?id='+${item.id}" target="_blank" th:title="${item.title}"  class="jtfylist jtfyl1">
                                                     <img th:src="${item.imagePath}" th:alt="${item.title}" style="width: 100%" />
                                                 </a>
                                             </div>
diff --git a/blxc-admin/target/classes/templates/portal/list.html b/blxc-admin/target/classes/templates/portal/list.html
index c35e47e..f088bbb 100644
--- a/blxc-admin/target/classes/templates/portal/list.html
+++ b/blxc-admin/target/classes/templates/portal/list.html
@@ -81,7 +81,6 @@
 <th:block th:include="portal/headerAndFooter :: search" />
 
 <script src="../../static/js/public.js" th:src="@{/portal/js/public.js}"></script>
-<script th:src="@{/portal/js/page.js}"></script>
 <script  th:inline="javascript">
 
     var newType = [[${threeCode}]]
@@ -94,7 +93,7 @@
     let str = result.rows.reduce(function (prve, item) {
     //                    <a href="/portal/details?id=${item.id}" target="_blank" title="${item.title}" class="clearfix">
     var url = "";
-    if(item.linkUrl){
+    if(item.type=='2'){
     url = item.linkUrl;
     }else{
     url= '/portal/details?id='+item.id
@@ -103,9 +102,14 @@
                 <li class="clearfix">
                     <a  href="${url}" target="_blank" title="${item.title}" class="clearfix">
                         <div class="left txt">
-                            <div class="fnt_22 title">${item.title}</div>
-                            <div class="des">${item.abstracts}</div>
-                        </div>
+                            <div class="fnt_22 title">${item.title}</div>`
+    if(item.abstracts){
+        prve +=`<div class="des">${item.abstracts}</div>`
+    }else{
+        prve +=`<div class="des"> </div>`
+    }
+
+    prve +=`</div>
                         <div class="right time">
                             <div class="ta">${item.publishTime}</div>
                             <div>发布时间</div>
@@ -130,13 +134,13 @@
     });
 
     async function mainListChange(page) {
-        var url = "/portal/dataList";
-        var div = document.getElementById("dataSource");
-        var dataParam = {newType:newType,pageNum: page, pageSize: 10}
-        $.post(url, dataParam, function(result) {
+    var url = "/portal/dataList";
+    var div = document.getElementById("dataSource");
+    var dataParam = {newType:newType,pageNum: page, pageSize: 10}
+    $.post(url, dataParam, function(result) {
 
-            let str = result.rows.reduce(function (prve, item) {
-            prve += `
+    let str = result.rows.reduce(function (prve, item) {
+    prve += `
                         <li class="clearfix">
                             <a href="/portal/details?id=${item.id}" target="_blank" title="2023-2024秋 本科生第二次游泳集中测试通知" class="clearfix">
                                 <div class="left txt">
@@ -150,13 +154,13 @@
                             </a>
                         </li>
                     `
-            return prve
-            }, '')
-            document.querySelector('.dataSource').innerHTML = str;
+    return prve
+    }, '')
+    document.querySelector('.dataSource').innerHTML = str;
 
-            //翻页
-            generPage(result.total, 'page_list')
-        });
+    //翻页
+    generPage(result.total, 'page_list')
+    });
     }
 
 
@@ -164,34 +168,35 @@
     //if($(window).width()<1024){
     //判断手机横竖屏状态：
     if (window.orientation == 180 || window.orientation == 0) {
-        //alert("竖屏状态！")
-        $(".stips").hide();
+    //alert("竖屏状态！")
+    $(".stips").hide();
     }
     if (window.orientation == 90 || window.orientation == -90) {
-        //alert("横屏状态！")
-        $(".stips").css({
-            display: "flex"
-        });
+    //alert("横屏状态！")
+    $(".stips").css({
+    display: "flex"
+    });
     }
 
     function hengshuping() {
-        if (window.orientation == 180 || window.orientation == 0) {
-            //alert("竖屏状态！")
-            $(".stips").hide();
-        }
-        if (window.orientation == 90 || window.orientation == -90) {
-            //alert("横屏状态！")
-            $(".stips").css({
-                display: "flex"
-            });
-        }
+    if (window.orientation == 180 || window.orientation == 0) {
+    //alert("竖屏状态！")
+    $(".stips").hide();
+    }
+    if (window.orientation == 90 || window.orientation == -90) {
+    //alert("横屏状态！")
+    $(".stips").css({
+    display: "flex"
+    });
+    }
     }
     //}
     window.addEventListener(
-        "onorientationchange" in window ? "orientationchange" : "resize",
-        hengshuping,
-        false
+    "onorientationchange" in window ? "orientationchange" : "resize",
+    hengshuping,
+    false
     );
 </script>
+<script th:src="@{/portal/js/page.js}"></script>
 </body>
 </html>
diff --git a/blxc-admin/target/classes/templates/portal/searchList.html b/blxc-admin/target/classes/templates/portal/searchList.html
index dcf7489..0308986 100644
--- a/blxc-admin/target/classes/templates/portal/searchList.html
+++ b/blxc-admin/target/classes/templates/portal/searchList.html
@@ -39,7 +39,7 @@
 
                         <ul class="dataSource" style="min-height:600px">
                             <li class="clearfix" th:each="item : ${list}">
-                                <a th:href="${item.linkUrl}?${item.linkUrl}:'/portal/details?id='+${item.id}" target="_blank" th:title="${item.title}" class="clearfix">
+                                <a th:href="${item.type=='2'}?${item.linkUrl}:'/portal/details?id='+${item.id}" target="_blank" th:title="${item.title}" class="clearfix">
                                     <div class="left txt">
                                         <div class="fnt_22 title">[[${item.title}]]</div>
                                         <div class="des">[[${item.abstracts}]]</div>
diff --git a/blxc-common/src/main/java/com/ruoyi/common/utils/StringUtils.java b/blxc-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
index e1e0ea9..720a840 100644
--- a/blxc-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
+++ b/blxc-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
@@ -684,7 +684,8 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
         if (isBlank(html)){
             return "";
         }
-        String regEx = "<.+?>";
+//        String regEx = "<.+?>";
+        String regEx = "<[^>]*>";
         Pattern p = Pattern.compile(regEx);
         Matcher m = p.matcher(html);
         String s = m.replaceAll("");
diff --git a/blxc-common/target/classes/com/ruoyi/common/utils/StringUtils.class b/blxc-common/target/classes/com/ruoyi/common/utils/StringUtils.class
index cc07e5ecf1585ae8f5009faa6aade11ca9c6903e..8141225e675adef1377c8cdac93083711bdbf272 100644
GIT binary patch
delta 42
ycmZ4KzuJF;949-wO>~@Htkz~_P7OK14Gg?Y8ySR{HZe#rZDvql+A=vt-4_7*Rtp3G

delta 40
wcmZ4OztVq$949NQjh?psW>roNIl=V|yi6MygqSumNHA?;P+;0TIZoXd0N1Gs82|tP