From 1b494a5d31f3ef874a904bbb48ef34ea90acba05 Mon Sep 17 00:00:00 2001
From: xiaoCJ <406612557@qq.com>
Date: Fri, 15 Dec 2023 08:54:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=8D=E6=96=B0=E5=AE=9E?=
=?UTF-8?q?=E8=AE=AD=E6=8E=A5=E5=8F=A3=EF=BC=8C=E7=99=BB=E5=BD=95=E6=8E=A5?=
=?UTF-8?q?=E5=8F=A3=E6=96=B0=E5=A2=9E=E5=AD=A6=E6=A0=A1=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../sztzjy/fund_investment/config/security/LoginResult.java | 3 +++
.../sztzjy/fund_investment/controller/UserController.java | 5 +++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/sztzjy/fund_investment/config/security/LoginResult.java b/src/main/java/com/sztzjy/fund_investment/config/security/LoginResult.java
index ec5b174..104ceb0 100644
--- a/src/main/java/com/sztzjy/fund_investment/config/security/LoginResult.java
+++ b/src/main/java/com/sztzjy/fund_investment/config/security/LoginResult.java
@@ -31,6 +31,8 @@ public class LoginResult {
private int classId;
@ApiModelProperty("用户所在学校id")
private int schoolId;
+ @ApiModelProperty("用户所在学校名称")
+ private String schoolName;
@ApiModelProperty("用户权限")
private List<String> authorityCodes;
@@ -74,6 +76,7 @@ public class LoginResult {
result.setMajorId(jwtUser.getMajorId());
result.setCollegeId(jwtUser.getCollegeId());
result.setUsername(jwtUser.getUsername());
+ result.setSchoolName(jwtUser.getSchoolName());
return result;
}
}
diff --git a/src/main/java/com/sztzjy/fund_investment/controller/UserController.java b/src/main/java/com/sztzjy/fund_investment/controller/UserController.java
index b4a8669..701e39b 100644
--- a/src/main/java/com/sztzjy/fund_investment/controller/UserController.java
+++ b/src/main/java/com/sztzjy/fund_investment/controller/UserController.java
@@ -105,8 +105,6 @@ public class UserController {
@AnonymousAccess
public ResultEntity reTraining(@RequestParam String userId) {
Flow flow = flowMapper.selectByPrimaryKey(userId);
- flow.setFlowId(IdUtil.simpleUUID());
- flowMapper.updateByPrimaryKey(flow);
PerformanceScoreExample example = new PerformanceScoreExample();
example.createCriteria().andFlowIdEqualTo(flow.getFlowId());
List<PerformanceScore> performanceScores = performanceScoreMapper.selectByExample(example);
@@ -114,6 +112,9 @@ public class UserController {
return null;
}
performanceScoreMapper.deleteByExample(example);
+ flow.setFlowId(IdUtil.simpleUUID());
+ flowMapper.updateByPrimaryKey(flow);
+
return new ResultEntity(HttpStatus.OK, "已重新实训！");
}
}