From 10b50bf45c9641c466667bafc86a369dd462cc70 Mon Sep 17 00:00:00 2001
From: wangxy <1356089412@qq.com>
Date: Tue, 6 Aug 2024 15:01:55 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BC=9A=E8=AE=AE=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/templates/system/tdmeeting/add.html  | 6 +++---
 .../src/main/resources/templates/system/tdmeeting/edit.html | 4 ++--
 .../src/main/resources/mapper/system/TdMeetingMapper.xml    | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/system/tdmeeting/add.html b/ruoyi-admin/src/main/resources/templates/system/tdmeeting/add.html
index aec551e..e003896 100644
--- a/ruoyi-admin/src/main/resources/templates/system/tdmeeting/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/tdmeeting/add.html
@@ -23,7 +23,7 @@
                 <div class="form-group">
                     <label class="col-sm-4 control-label is-required">会议时间：</label>
                     <div class="col-sm-8">
-                        <input type="text" class="form-control m-b" placeholder="请选择会议时间" name="meetingTime"></input>
+                        <input type="text" class="form-control m-b" required placeholder="请选择会议时间" name="meetingTime"></input>
                     </div>
                 </div>
             </div>
@@ -81,12 +81,12 @@
         <div class="row">
             <div class="col-sm-12">
                 <div class="form-group">
-                    <label class="col-sm-2 control-label is-required">上传文件：</label>
+                    <label class="col-sm-2 control-label">上传文件：</label>
                     <div class="fileinput fileinput-new col-sm-10" data-provides="fileinput">
                         <span class="btn btn-white btn-file">
                             <span class="fileinput-new">选择文件</span>
                             <span class="fileinput-exists">更改</span>
-                            <input type="file" id="fileUrlId" name="..." required>
+                            <input type="file" id="fileUrlId" name="..." >
                             <input type="hidden" id="fileUrl" name="fileUrl">
                             <input type="hidden" id="fileName" name="fileName">
                         </span>
diff --git a/ruoyi-admin/src/main/resources/templates/system/tdmeeting/edit.html b/ruoyi-admin/src/main/resources/templates/system/tdmeeting/edit.html
index f5c6399..1bbc0ee 100644
--- a/ruoyi-admin/src/main/resources/templates/system/tdmeeting/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/tdmeeting/edit.html
@@ -24,7 +24,7 @@
                 <div class="form-group">
                     <label class="col-sm-4 control-label is-required">会议时间：</label>
                     <div class="col-sm-8">
-                        <input type="text" class="form-control m-b" placeholder="请选择会议时间" th:value="${#dates.format(meeting.meetingTime, 'yyyy-MM-dd')}" name="meetingTime"></input>
+                        <input type="text" class="form-control m-b" required placeholder="请选择会议时间" th:value="${#dates.format(meeting.meetingTime, 'yyyy-MM-dd')}" name="meetingTime"></input>
                     </div>
                 </div>
             </div>
@@ -82,7 +82,7 @@
         <div class="row">
             <div class="col-sm-12">
                 <div class="form-group">
-                    <label class="col-sm-2 control-label is-required">上传文件：</label>
+                    <label class="col-sm-2 control-label">上传文件：</label>
                     <div class="fileinput fileinput-new col-sm-10" data-provides="fileinput">
                         <span class="btn btn-white btn-file">
                             <span class="fileinput-new">选择文件</span>
diff --git a/ruoyi-system/src/main/resources/mapper/system/TdMeetingMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdMeetingMapper.xml
index 9681269..3cab1f1 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TdMeetingMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TdMeetingMapper.xml
@@ -34,10 +34,10 @@
     <select id="selectTdMeetingList" resultType="com.ruoyi.system.domain.TdMeeting">
         select  <include refid="Base_Column_List"/> from  td_meeting
         <trim prefix="where" prefixOverrides="and|or">
-            <if test="meetingType!=null and meetingTitle!=''">
+            <if test="meetingType!=null and meetingType!=''">
                 AND meeting_type = #{meetingType}
             </if>
-            <if test="meetingState!=null and meetingTitle!=''">
+            <if test="meetingState!=null and meetingState!=''">
                 AND meeting_state = #{meetingState}
             </if>
             <if test="meetingTitle!=null and meetingTitle!=''">