From bef4f6d51bff03c0512a75f43e79699b7296f1fa Mon Sep 17 00:00:00 2001
From: EricsHu <hrr145632>
Date: 星期四, 23 十一月 2023 18:00:53 +0800
Subject: [PATCH] 修改系统角色逻辑、和老师身份逻辑
---
src/main/java/com/qxueyou/scc/teach/student/service/impl/StudentService.java | 36 ++++++++++++++++++++++--------------
1 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/teach/student/service/impl/StudentService.java b/src/main/java/com/qxueyou/scc/teach/student/service/impl/StudentService.java
index b43fee9..3441543 100644
--- a/src/main/java/com/qxueyou/scc/teach/student/service/impl/StudentService.java
+++ b/src/main/java/com/qxueyou/scc/teach/student/service/impl/StudentService.java
@@ -1,10 +1,7 @@
package com.qxueyou.scc.teach.student.service.impl;
import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
import cn.hutool.core.date.LocalDateTimeUtil;
@@ -34,6 +31,7 @@
import com.qxueyou.scc.user.model.QUser;
import com.qxueyou.scc.user.model.User;
import com.qxueyou.scc.user.service.IUserService;
+import org.springframework.util.DigestUtils;
@Service
public class StudentService extends CommonAppService implements IStudentService {
@@ -131,11 +129,11 @@
public Result updateStudent(String studentId, String name,String password, String studentNo, boolean sex, String phoneNo) {
//鏍规嵁瀛﹀鍛業D锛岃幏鍙栫敤鎴蜂俊鎭�
StuStudent stu = this.read(StuStudent.class, studentId);
-
- if (!stu.getStudentNo().equals(studentNo) && dao.exists(studentNo,ClientUtils.getOrgId())) {
- return new Result(false, "瀛﹀彿宸插瓨鍦�");
+ if(stu.getStudentNo() != null){
+ if (!stu.getStudentNo().equals(studentNo) && dao.exists(studentNo,ClientUtils.getOrgId())) {
+ return new Result(false, "瀛﹀彿宸插瓨鍦�");
+ }
}
-
stu.setName(name);
stu.setSex(sex);
stu.setStudentNo(studentNo);
@@ -147,8 +145,14 @@
user.setAccount(studentNo);
user.setSex(sex);
user.setMobilePhone(phoneNo);
- if(!StringUtils.isEmpty(password)){
- user.setPassword(password);
+ //闅忔満瀛楃涓�
+ String salt= UUID.randomUUID().toString();
+ //鐩愬��
+ user.setSalt(salt);
+ //瀵瑰瘑鐮佽繘琛屽姞瀵嗗鐞�
+ String newPassword= DigestUtils.md5DigestAsHex((salt+password).getBytes());
+ if(!StringUtils.isEmpty(newPassword)){
+ user.setPassword(newPassword);
}
user.setName(name);
save(user);
@@ -248,14 +252,18 @@
String hql = "from ExerciseCompleteInfo where studentId=? and deleteFlag is false";
List<Object> Params = CollectionUtils.newList(studentId);
ExerciseCompleteInfo unique = findUnique(hql, Params, ExerciseCompleteInfo.class);
- unique.setDeleteFlag(false);
- commonDAO.update(unique);
+ if(unique!=null) {
+ unique.setDeleteFlag(false);
+ commonDAO.update(unique);
+ }
}else {
String hql = "from ExerciseCompleteInfo where studentId=? and deleteFlag is false";
List<Object> Params = CollectionUtils.newList(studentId);
ExerciseCompleteInfo unique = findUnique(hql, Params, ExerciseCompleteInfo.class);
- unique.setDeleteFlag(true);
- commonDAO.update(unique);
+ if(unique!=null){
+ unique.setDeleteFlag(true);
+ commonDAO.update(unique);
+ }
}
return new Result(true);
}
--
Gitblit v1.8.0