From 26422a99ed7e19579ca11f008c180addc21f5153 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期三, 08 五月 2024 17:46:34 +0800
Subject: [PATCH] fix：禁用的人不能被查出来考试、题目去重
---
src/main/java/com/mindskip/xzs/controller/admin/UserController.java | 2 +-
src/main/java/com/mindskip/xzs/domain/vo/FeedbackVO.java | 2 ++
src/main/resources/mapper/UserMapper.xml | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/controller/admin/UserController.java b/src/main/java/com/mindskip/xzs/controller/admin/UserController.java
index 416c421..623b48d 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/UserController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/UserController.java
@@ -173,7 +173,7 @@
@RequestMapping(value = "/changeStatus/{id}", method = RequestMethod.POST)
public RestResponse<Integer> changeStatus(@PathVariable Integer id) {
- User user = userService.getUserById(id);
+ User user = userService.selectById(id);
UserStatusEnum userStatusEnum = UserStatusEnum.fromCode(user.getStatus());
Integer newStatus = userStatusEnum == UserStatusEnum.Enable ? UserStatusEnum.Disable.getCode() : UserStatusEnum.Enable.getCode();
user.setStatus(newStatus);
diff --git a/src/main/java/com/mindskip/xzs/domain/vo/FeedbackVO.java b/src/main/java/com/mindskip/xzs/domain/vo/FeedbackVO.java
index 8f77119..2e3f6dd 100644
--- a/src/main/java/com/mindskip/xzs/domain/vo/FeedbackVO.java
+++ b/src/main/java/com/mindskip/xzs/domain/vo/FeedbackVO.java
@@ -1,5 +1,6 @@
package com.mindskip.xzs.domain.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import javax.validation.constraints.NotNull;
@@ -27,6 +28,7 @@
private Boolean fix;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime fixTime;
private Integer pageIndex;
diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml
index c0242e5..8e79abe 100644
--- a/src/main/resources/mapper/UserMapper.xml
+++ b/src/main/resources/mapper/UserMapper.xml
@@ -267,7 +267,7 @@
select
<include refid="Base_Column_List"/>
from t_user
- where id=#{value}
+ where id=#{value} and status = 1 and deleted = 0
</select>
<select id="getUserByUserName" resultMap="BaseResultMap">
--
Gitblit v1.8.0