From 558ea657b4d1d1c1f4730a6fed0884cb21bfceaa Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Wed, 26 Oct 2022 12:10:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=AA=8C=E8=AF=81=E7=9A=84?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/MainDbSyncServiceImpl.java   | 27 +++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/servers/boe-server-basic/src/main/java/com/xboe/primary/service/impl/MainDbSyncServiceImpl.java b/servers/boe-server-basic/src/main/java/com/xboe/primary/service/impl/MainDbSyncServiceImpl.java
index 4f1a14b1..7b5cab53 100644
--- a/servers/boe-server-basic/src/main/java/com/xboe/primary/service/impl/MainDbSyncServiceImpl.java
+++ b/servers/boe-server-basic/src/main/java/com/xboe/primary/service/impl/MainDbSyncServiceImpl.java
@@ -89,14 +89,37 @@ public class MainDbSyncServiceImpl implements IMainDbSyncService {
 		//System.out.println("dto.name="+dto.getName());
 		Integer employeeStatus=dto.getEmployeeStatus();
 		//同一个用户工号对应 多个kid的情况,所以直接根据kid查询是不对的,同步过来的，使用sysId查询
+		MainAccount a=null;
 		MainUser user = userDao.get(dto.getId());
 		if(user!=null) {
 			//更新用户信息，更新账号信息
 			user.setSysId(dto.getKid());
-			//hasUser.setBirthday(null);
+			user.setName(dto.getName());
+			user.setDepartId(dto.getDepartId());
+			user.setDescription(dto.getDescription());
+			user.setDomainId(dto.getDomainId());
+			user.setDuty(dto.getDuty());
+			user.setSysId(dto.getKid());
+			user.setLearningDuration(dto.getLearningDuration());
+			user.setName(dto.getName());
+			user.setRank(dto.getRank());
+			user.setSassId(dto.getSassId());
+			user.setTelephoneNo(dto.getTelephoneNo());
+			user.setUserNo(dto.getUserNo());
+			user.setGender(dto.toGenderInteger()==3? 1:dto.toGenderInteger());
+			user.setGraduatedFrom(dto.getGraduatedFrom());
+			user.setGraduatedMajor(dto.getGraduatedMajor());
+			user.setHighestEducation(dto.getHighestEducation());
+			user.setHomePhoneNo(dto.getHomePhoneNo());
+			user.setIdNumber(dto.getIdNumber());
+			user.setMobileNo(dto.getMobile());
+			user.setNationality(dto.getNationality());
+			userDao.saveAndFlush(user);
+			//账号没有修改的字段，所以不进行更新操作了
+			//a=accountDao.getById(dto.getId());
 		}else {
 			//账号信息
-			MainAccount a=new MainAccount();
+			a=new MainAccount();
 			//同步过程中一样，可以不一样。因为此系统当前是一致的，所以统一使用一个
 			a.setId(dto.getId());
 			a.setAvatar(dto.getAvatar());