From a08f4615efabf663afabc9eff2982480d6e05fe5 Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Fri, 13 Jan 2023 11:13:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=99=E5=B8=88=E7=9A=84=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=EF=BC=8C=E5=9C=A8=E6=B2=A1=E6=9C=89=E6=83=85=E5=86=B5=E4=B8=8B?=
 =?UTF-8?q?=EF=BC=8C=E9=9C=80=E8=A6=81=E6=B7=BB=E5=8A=A0=E6=95=99=E5=B8=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TeacherServiceImpl.java      | 41 +++++++++++++------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/teacher/service/impl/TeacherServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/teacher/service/impl/TeacherServiceImpl.java
index 3328801d..907174ad 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/module/teacher/service/impl/TeacherServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/teacher/service/impl/TeacherServiceImpl.java
@@ -210,19 +210,34 @@ public class TeacherServiceImpl implements ITeacherService {
     @Transactional
     public void updateTeacher(TeacherFiledVo entity) {
     	
-//        Teacher teacher = dao.get(entity.getId());
-//        teacher.setPhoto(entity.getPhoto());
-//        teacher.setWorkExperience(entity.getWorkExperience());
-//        teacher.setCourses(entity.getCourses());
-//        teacher.setExpertise(entity.getExpertise());
-//        dao.update(teacher);
-    	//修改为以下方式，不影响其它字段的
-        dao.updateMultiFieldById(entity.getId(),
-        		UpdateBuilder.create("photo", entity.getPhoto()),
-        		UpdateBuilder.create("workExperience", entity.getWorkExperience()),
-        		UpdateBuilder.create("courses", entity.getCourses()),
-        		UpdateBuilder.create("expertise", entity.getExpertise())
-        );
+        Teacher teacher = dao.get(entity.getId());
+        if(teacher==null) {
+        	teacher=new Teacher();
+        	teacher.setId(entity.getId());
+        	teacher.setPhoto(entity.getPhoto());
+            teacher.setWorkExperience(entity.getWorkExperience());
+            teacher.setCourses(entity.getCourses());
+            teacher.setExpertise(entity.getExpertise());
+            teacher.setWaitStatus(0);
+            teacher.setCertStatus(0);
+            teacher.setStatus(1);
+            teacher.setDeleted(false);
+            //提取用户信息
+            User  u= userService.get(entity.getId());
+            if(u!=null) {
+            	teacher.setName(u.getName());
+            	teacher.setDepartId(u.getDepartId());
+            	teacher.setGender(u.getGender());
+            }
+            dao.save(teacher);
+        }else {
+        	dao.updateMultiFieldById(entity.getId(),
+            		UpdateBuilder.create("photo", entity.getPhoto()),
+            		UpdateBuilder.create("workExperience", entity.getWorkExperience()),
+            		UpdateBuilder.create("courses", entity.getCourses()),
+            		UpdateBuilder.create("expertise", entity.getExpertise())
+            );
+        }
     }
 
     @Override