From 42c48ce1d64e941d28c7bfe4093f9659e77bd523 Mon Sep 17 00:00:00 2001
From: yn147 <2270338776@qq.com>
Date: 星期四, 23 十一月 2023 20:23:37 +0800
Subject: [PATCH] 学籍，毕业，档案，考勤
---
src/main/java/com/qxueyou/scc/teach/student/service/impl/StudentService.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 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 a272d69..19b3f81 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
@@ -129,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);
@@ -185,6 +185,19 @@
map.put("score", tuple.get(qStuStudent.score));
map.put("graduationText", tuple.get(qStuStudent.graduationText));
map.put("imgPath", tuple.get(qUser.imgPath));
+ map.put("photo", tuple.get(qStuStudent.photo));
+ map.put("passporName", tuple.get(qStuStudent.passporName));
+ map.put("nationality", tuple.get(qStuStudent.nationality));
+ map.put("ancestralHome", tuple.get(qStuStudent.ancestralHome));
+ map.put("birthday", tuple.get(qStuStudent.birthday));
+ map.put("birthplace", tuple.get(qStuStudent.birthplace));
+ map.put("chinaStatus", tuple.get(qStuStudent.chinaStatus));
+ map.put("registeredAddress", tuple.get(qStuStudent.registeredAddress));
+ map.put("homeAddress", tuple.get(qStuStudent.homeAddress));
+ map.put("religiousBelief", tuple.get(qStuStudent.religiousBelief));
+ map.put("email", tuple.get(qStuStudent.email));
+ map.put("workUnit", tuple.get(qStuStudent.workUnit));
+ map.put("graduationDestination", tuple.get(qStuStudent.graduationDestination));
return map;
}).collect(Collectors.toList());
}
--
Gitblit v1.8.0