From e3c18922e733f363a20196f45e0d613ec29ebbd4 Mon Sep 17 00:00:00 2001
From: Himit_ZH <372347736@qq.com>
Date: Fri, 16 Jul 2021 21:41:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=84=E6=B5=8B=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E4=B8=A2=E5=A4=B1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/AdminContestController.java         |  6 ++++-
 .../hoj/controller/admin/FileController.java  |  2 --
 .../top/hcode/hoj/dao/xml/ContestMapper.xml   |  2 +-
 hoj-vue/src/views/admin/problem/Problem.vue   | 23 +++++++++++--------
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/hoj-springboot/DataBackup/src/main/java/top/hcode/hoj/controller/admin/AdminContestController.java b/hoj-springboot/DataBackup/src/main/java/top/hcode/hoj/controller/admin/AdminContestController.java
index ba82112f..d50f14ff 100644
--- a/hoj-springboot/DataBackup/src/main/java/top/hcode/hoj/controller/admin/AdminContestController.java
+++ b/hoj-springboot/DataBackup/src/main/java/top/hcode/hoj/controller/admin/AdminContestController.java
@@ -225,7 +225,11 @@ public class AdminContestController {
         QueryWrapper<Problem> problemQueryWrapper = new QueryWrapper<>();
 
         if (problemType != null) { // 必备条件 隐藏的不可取来做比赛题目
-            problemQueryWrapper.eq("type", problemType).ne("auth", 2);
+            problemQueryWrapper
+                    // vj题目不限制赛制
+                    .and(wrapper->wrapper.eq("type", problemType)
+                    .or().eq("is_remote", true))
+                    .ne("auth", 2);
         }
 
         // 逻辑判断，如果是查询已有的就应该是in，如果是查询不要重复的，使用not in
diff --git a/hoj-springboot/DataBackup/src/main/java/top/hcode/hoj/controller/admin/FileController.java b/hoj-springboot/DataBackup/src/main/java/top/hcode/hoj/controller/admin/FileController.java
index 636321f5..0d129fd0 100644
--- a/hoj-springboot/DataBackup/src/main/java/top/hcode/hoj/controller/admin/FileController.java
+++ b/hoj-springboot/DataBackup/src/main/java/top/hcode/hoj/controller/admin/FileController.java
@@ -279,7 +279,6 @@ public class FileController {
             }
             Assert.isTrue(hasTestCase, "对不起，该题目的评测数据为空！");
 
-            workDir = Constants.File.FILE_DOWNLOAD_TMP_FOLDER.getPath() + File.separator + IdUtil.simpleUUID();
             FileUtil.mkdir(workDir);
             // 写入本地
             for (int i = 0; i < problemCaseList.size(); i++) {
@@ -340,7 +339,6 @@ public class FileController {
                 e.printStackTrace();
             }
             // 清空临时文件
-            FileUtil.del(workDir);
             FileUtil.del(Constants.File.FILE_DOWNLOAD_TMP_FOLDER.getPath() + File.separator + fileName);
         }
     }
diff --git a/hoj-springboot/DataBackup/src/main/java/top/hcode/hoj/dao/xml/ContestMapper.xml b/hoj-springboot/DataBackup/src/main/java/top/hcode/hoj/dao/xml/ContestMapper.xml
index 7bab0941..93a8c4a0 100644
--- a/hoj-springboot/DataBackup/src/main/java/top/hcode/hoj/dao/xml/ContestMapper.xml
+++ b/hoj-springboot/DataBackup/src/main/java/top/hcode/hoj/dao/xml/ContestMapper.xml
@@ -16,7 +16,7 @@
                 and c.type = #{type}
             </if>
         </where>
-        order by c.start_time DESC,c.id DESC
+        order by c.status ASC, c.start_time DESC
     </select>
     <select id="getContestInfoById" resultType="top.hcode.hoj.pojo.vo.ContestVo" useCache="true">
         select c.id,c.author,c.title,c.type,c.status,c.description,c.seal_rank,c.seal_rank_time,c.source,c.auth,c.start_time,c.end_time,c.duration
diff --git a/hoj-vue/src/views/admin/problem/Problem.vue b/hoj-vue/src/views/admin/problem/Problem.vue
index a2604c22..d691054f 100644
--- a/hoj-vue/src/views/admin/problem/Problem.vue
+++ b/hoj-vue/src/views/admin/problem/Problem.vue
@@ -837,9 +837,9 @@ export default {
             data.spjCode = '';
             data.spj = false;
           }
+          data.spjLanguage = data.spjLanguage || 'C';
           this.spjRecord.spjLanguage = data.spjLanguage;
           this.spjRecord.spjCode = data.spjCode;
-          data.spjLanguage = data.spjLanguage || 'C';
           this.problem = data;
           this.problem['examples'] = utils.stringToExamples(data.examples);
           this.problem['examples'][0]['isOpen'] = true;
@@ -1280,15 +1280,18 @@ export default {
       }
 
       let problemDto = {}; // 上传给后台的数据
-      if (!this.problem.spj) {
-        this.problem.spjCode = '';
-        this.problem.spjLanguage = '';
-      }
-      if (
-        this.spjRecord.spjLanguage != this.problem.spjLanguage ||
-        this.spjRecord.spjCode != this.problem.spjCode
-      ) {
-        problemDto['changeSpj'] = true;
+      if (this.problem.spj) {
+        if (
+          this.spjRecord.spjLanguage != this.problem.spjLanguage ||
+          this.spjRecord.spjCode != this.problem.spjCode
+        ) {
+          problemDto['changeSpj'] = true;
+        }
+      } else {
+        // 原本是spj，但现在关闭了
+        if (!this.spjRecord.spjCode) {
+          problemDto['changeSpj'] = true;
+        }
       }
       problemDto['problem'] = Object.assign({}, this.problem); // 深克隆
       problemDto.problem.examples = utils.examplesToString(