编辑功能图片提示问题调整

ruoyi-front/src/main/java/com/ruoyi/front/domain/OnlineCoursesEvaluate.java

@@ -23,6 +23,9 @@ public class OnlineCoursesEvaluate extends BaseEntity
     @Excel(name = "线上课程ID")
     private Long onlineCoursesId;
 
+    //线上课程标题
+    private String onlineCoursesName;
+
     /** 评价内容 */
     @Excel(name = "评价内容")
     private String evaluateContent;
@@ -51,6 +54,15 @@ public class OnlineCoursesEvaluate extends BaseEntity
         this.id = id;
     }
 
+    public String getOnlineCoursesName()
+    {
+        return onlineCoursesName;
+    }
+    public void setOnlineCoursesName(String  onlineCoursesName)
+    {
+        this.onlineCoursesName = onlineCoursesName;
+    }
+
     public Long getId() 
     {
         return id;
@@ -124,6 +136,7 @@ public class OnlineCoursesEvaluate extends BaseEntity
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
             .append("onlineCoursesId", getOnlineCoursesId())
+            .append("onlineCoursesName", getOnlineCoursesName())
             .append("evaluateContent", getEvaluateContent())
             .append("anonymousFlag", getAnonymousFlag())
             .append("delFlag", getDelFlag())

ruoyi-front/src/main/resources/mapper/front/OnlineCoursesEvaluateMapper.xml

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="OnlineCoursesEvaluate" id="OnlineCoursesEvaluateResult">
         <result property="id"    column="id"    />
         <result property="onlineCoursesId"    column="online_courses_id"    />
+        <result property="onlineCoursesName"    column="online_courses_name"    />
         <result property="evaluateContent"    column="evaluate_content"    />
         <result property="anonymousFlag"    column="anonymous_flag"    />
         <result property="delFlag"    column="del_flag"    />
@@ -21,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectOnlineCoursesEvaluateVo">
-        select ce.id, ce.online_courses_id, ce.evaluate_content, ce.anonymous_flag, ce.create_by, ce.create_time, ce.update_by, ce.update_time, ce.audit_status, su.login_name check_by, ce.remark,ce.check_time from online_courses_evaluate ce left join sys_user su on ce.check_by=su.user_id
+        select ce.id, ce.online_courses_id,oc.title online_courses_name, ce.evaluate_content, ce.anonymous_flag, ce.create_by, ce.create_time, ce.update_by, ce.update_time, ce.audit_status, su.user_name check_by, ce.remark,ce.check_time from online_courses_evaluate ce join online_courses oc on ce.online_courses_id=oc.id left join sys_user su on ce.check_by=su.user_id
     </sql>
 
     <select id="selectOnlineCoursesEvaluateList" parameterType="OnlineCoursesEvaluate" resultMap="OnlineCoursesEvaluateResult">

ruoyi-front/src/main/resources/templates/front/carousel/edit.html

@@ -27,9 +27,11 @@
 
         function submitHandler() {
             if ($.validate.form()) {
-                let result = uploadFile(false, "pictureUrl");
+                if ($('#filePath')[0].files[0] != null) {
-                if (result != web_status.SUCCESS) {
+                    let result = uploadFile(false, "pictureUrl");
-                    return;
+                    if (result != web_status.SUCCESS) {
+                        return;
+                    }
                 }
                 $.operate.save(prefix + "/edit", $('#form-carousel-edit').serialize());
             }

ruoyi-front/src/main/resources/templates/front/cases/edit.html

@@ -66,9 +66,11 @@
         function submitHandler() {
             if ($.validate.form()) {
                 //同步上传图片，并且将上传图片返回的地址，赋值到pictureUrl对应的隐藏域上
-                let result = uploadFile(false, "pictureUrl");
+                if ($('#filePath')[0].files[0] != null) {
-                if (result != web_status.SUCCESS) {
+                    let result = uploadFile(false, "pictureUrl");
-                    return;
+                    if (result != web_status.SUCCESS) {
+                        return;
+                    }
                 }
                 $.operate.save(prefix + "/edit", $('#form-cases-edit').serialize());
             }

ruoyi-front/src/main/resources/templates/front/courses/edit.html

@@ -56,7 +56,7 @@
                     <textarea name="videoUrl" class="form-control" required>[[*{videoUrl}]]</textarea>
                 </div>-->
                 <div class="col-sm-8">
-                    <input id="videoFilePath" name="videoFilePath" class="form-control" type="file" multiple data-min-file-count="1" data-theme="fas">
+                    <input id="videoFilePath" name="videoFilePath" class="form-control" type="file" >
                     <input id="videoUrl" name="videoUrl" th:field="*{videoUrl}"  type="text" hidden>
                 </div>
             </div>
@@ -91,14 +91,18 @@
 
         function submitHandler() {
             if ($.validate.form()) {
-                let result = uploadFile(false, "pictureUrl");
+                if ($('#filePath')[0].files[0] != null) {
-                if (result != web_status.SUCCESS) {
+                    let result = uploadFile(false, "pictureUrl");
-                    return;
+                    if (result != web_status.SUCCESS) {
+                        return;
+                    }
                 }
 
-                let result2 = uploadMoreFile(false, "videoUrl","videoFilePath");
+                if ($('#videoFilePath')[0].files[0] != null) {
-                if (result2 != web_status.SUCCESS) {
+                    let result2 = uploadMoreFile(false, "videoUrl", "videoFilePath");
-                    return;
+                    if (result2 != web_status.SUCCESS) {
+                        return;
+                    }
                 }
                 $.operate.save(prefix + "/edit", $('#form-courses-edit').serialize());
             }

ruoyi-front/src/main/resources/templates/front/evaluate/evaluate.html

@@ -108,6 +108,10 @@
                     field: 'onlineCoursesId',
                     title: '线上课程ID'
                 },
+                {
+                    field: 'onlineCoursesName',
+                    title: '线上课程标题'
+                },
                 {
                     field: 'evaluateContent',
                     title: '评价内容'

ruoyi-front/src/main/resources/templates/front/recruitment/edit.html

@@ -63,9 +63,11 @@
 
         function submitHandler() {
             if ($.validate.form()) {
-                let result = uploadFile(false, "pictureUrl");
+                if ($('#filePath')[0].files[0] != null) {
-                if (result != web_status.SUCCESS) {
+                    let result = uploadFile(false, "pictureUrl");
-                    return;
+                    if (result != web_status.SUCCESS) {
+                        return;
+                    }
                 }
                 $.operate.save(prefix + "/edit", $('#form-recruitment-edit').serialize());
             }