update import user table

This commit is contained in:
Himit_ZH 2021-12-14 21:16:11 +08:00
parent a8af40d0e9
commit 21dded9e74
2 changed files with 38 additions and 6 deletions

View File

@ -272,9 +272,10 @@ public class JudgeController {
boolean root = SecurityUtils.getSubject().hasRole("root"); // 是否为超级管理员
HashMap<String, Object> result = new HashMap<>();
Contest contest = null;
if (judge.getCid() != 0 && !root) {
Contest contest = contestService.getById(judge.getCid());
if (!userRolesVo.getUid().equals(contest.getUid()) && contest.getSealRank()
contest = contestService.getById(judge.getCid());
if (userRolesVo != null && !userRolesVo.getUid().equals(contest.getUid()) && contest.getSealRank()
&& contest.getType().intValue() == Constants.Contest.TYPE_OI.getCode()
&& contest.getStatus().intValue() == Constants.Contest.STATUS_RUNNING.getCode()
&& contest.getSealRankTime().before(new Date())) {
@ -292,9 +293,10 @@ public class JudgeController {
// 当此次提交代码不共享
// 比赛提交只有比赛创建者和root账号可看代码
if (judge.getCid() != 0) {
Contest contest = contestService.getById(judge.getCid());
if (!root && !userRolesVo.getUid().equals(contest.getUid())) {
if (contest == null) {
contest = contestService.getById(judge.getCid());
}
if (userRolesVo != null && !root && !userRolesVo.getUid().equals(contest.getUid())) {
// 如果是比赛,那么还需要判断是否为封榜,比赛管理员和超级管理员可以有权限查看(ACM题目除外)
if (contest.getSealRank()
&& contest.getType().intValue() == Constants.Contest.TYPE_OI.getCode()

View File

@ -183,7 +183,7 @@
<vxe-table-column
:title="$t('m.Password')"
field="password"
min-width="150"
min-width="130"
show-overflow
>
<template v-slot="{ row }">
@ -210,6 +210,36 @@
{{ row[3] }}
</template>
</vxe-table-column>
<vxe-table-column
:title="$t('m.Gender')"
field="gender"
min-width="60"
show-overflow
>
<template v-slot="{ row }">
{{ row[4] }}
</template>
</vxe-table-column>
<vxe-table-column
:title="$t('m.Nickname')"
field="nickname"
min-width="100"
show-overflow
>
<template v-slot="{ row }">
{{ row[5] }}
</template>
</vxe-table-column>
<vxe-table-column
:title="$t('m.School')"
field="school"
min-width="100"
show-overflow
>
<template v-slot="{ row }">
{{ row[6] }}
</template>
</vxe-table-column>
</vxe-table>
<div class="panel-options">