From 2096476ceca660445ff8e2c476154197425d194e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=B8=85?= <ls1006@126.com>
Date: Thu, 23 Oct 2025 17:04:29 +0800
Subject: [PATCH] =?UTF-8?q?1.BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/hezhi/TbExamNoticeMapper.xml          |  6 +++---
 ruoyi-ui/src/views/hezhi/examSubject/index.vue   |  1 +
 ruoyi-ui/src/views/hezhi/notice/index.vue        | 16 ++++++++++++----
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/hezhi/TbExamNoticeMapper.xml b/ruoyi-system/src/main/resources/mapper/hezhi/TbExamNoticeMapper.xml
index c1febe4..4ab6db9 100644
--- a/ruoyi-system/src/main/resources/mapper/hezhi/TbExamNoticeMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/hezhi/TbExamNoticeMapper.xml
@@ -185,10 +185,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         -- 动态排序字段：未过期标记为0（排前面），已过期标记为1（排后面）
         CASE
             WHEN ten.exam_start_time >= CURDATE() THEN 0
-            ELSE 1 END AS isExpired,
-        ter.exam_registration_id as examRegistrationId
+            ELSE 1 END AS isExpired
+#         ter.exam_registration_id as examRegistrationId
         FROM tb_exam_notice ten
-        LEFT JOIN tb_exam_registration ter on ten.exam_id = ter.exam_id and ten.batch_index = ter.exam_batch_index
+#         LEFT JOIN tb_exam_registration ter on ten.exam_id = ter.exam_id and ten.batch_index = ter.exam_batch_index
         WHERE ten.status = 0 AND ten.del_flag = 0
         <if test="searchValue != null and searchValue != ''">
             AND (ten.exam_notice_name LIKE CONCAT('%', #{searchValue}, '%') OR ten.exam_notice_introduce LIKE CONCAT('%', #{searchValue}, '%'))
diff --git a/ruoyi-ui/src/views/hezhi/examSubject/index.vue b/ruoyi-ui/src/views/hezhi/examSubject/index.vue
index 2040d00..144b9b0 100644
--- a/ruoyi-ui/src/views/hezhi/examSubject/index.vue
+++ b/ruoyi-ui/src/views/hezhi/examSubject/index.vue
@@ -87,6 +87,7 @@
           <span v-if="scope.row.examType ? scope.row.examType.includes('1') : false">模拟考试</span>
         </template>
       </el-table-column>
+      <el-table-column label="专业名称" align="center" prop="subjectWarehouseClassName" width="120px" />
       <el-table-column label="等级" align="center" prop="level" width="100px">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.tb_subject_level" :value="scope.row.level" />
diff --git a/ruoyi-ui/src/views/hezhi/notice/index.vue b/ruoyi-ui/src/views/hezhi/notice/index.vue
index 18d7c27..454a03c 100644
--- a/ruoyi-ui/src/views/hezhi/notice/index.vue
+++ b/ruoyi-ui/src/views/hezhi/notice/index.vue
@@ -307,11 +307,19 @@ export default {
           { required: true, message: "内容不能为空", trigger: "blur" },
           {
             validator: (rule, value, callback) => {
-              if (!value || value.replace(/<[^>]+>/g, '').trim() === '') {
-                callback(new Error('请输入有效内容'));
-              } else {
-                callback();
+              if (!value) {
+                return callback(new Error('请输入有效内容'));
               }
+              // 临时移除图片标签，检查剩余文本内容
+              const contentWithoutImages = value.replace(/<img[^>]*>/gi, '');
+              const cleanText = contentWithoutImages.replace(/<[^>]+>/g, '').trim();
+              // 如果有图片或者有文本内容，都算有效
+              const hasImages = /<img[^>]*>/i.test(value);
+              const hasText = cleanText !== '';
+              if (!hasImages && !hasText) {
+                return callback(new Error('请输入有效内容'));
+              }
+              callback();
             },
             trigger: 'blur'
           }
-- 
2.22.0