From 004545d3db989b2e238eef445a26ed7c2b88a21b Mon Sep 17 00:00:00 2001 From: daihh Date: Tue, 6 Dec 2022 18:25:57 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8C=E6=AD=A5=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=B9kid=E7=9A=84=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xboe/basic/service/impl/BasicDataSyncServiceImpl.java | 7 +++++-- .../xboe/primary/service/impl/MainDbSyncServiceImpl.java | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/servers/boe-server-basic/src/main/java/com/xboe/basic/service/impl/BasicDataSyncServiceImpl.java b/servers/boe-server-basic/src/main/java/com/xboe/basic/service/impl/BasicDataSyncServiceImpl.java index 4a7c18d0..1dc80111 100644 --- a/servers/boe-server-basic/src/main/java/com/xboe/basic/service/impl/BasicDataSyncServiceImpl.java +++ b/servers/boe-server-basic/src/main/java/com/xboe/basic/service/impl/BasicDataSyncServiceImpl.java @@ -168,6 +168,10 @@ public class BasicDataSyncServiceImpl implements IBasicDataSyncService{ } //同一个用户工号对应 多个kid的情况,所以直接根据kid查询是不对的,所以这里按工号查询,不使用kid User user = userDao.findOne(FieldFilters.eq("userNo", dto.getUserNo())); + //2022-12-16 增加kid的判断 + if(user==null){ + user = userDao.findOne(FieldFilters.eq("kid",dto.getKid())); + } if(user==null) { //人员基本信息 Person person=new Person(); @@ -230,8 +234,6 @@ public class BasicDataSyncServiceImpl implements IBasicDataSyncService{ user.setPayrollPlaceId(dto.getPayrollPlaceId()); user.setPayrollPlaceName(dto.getPayrollPlaceName()); user.setEmployeeStatus(dto.getEmployeeStatus()); - - if(user.getStatus()==null) { user.setStatus(1);//如果为空，就是正常 } @@ -253,6 +255,7 @@ public class BasicDataSyncServiceImpl implements IBasicDataSyncService{ }else { //更新时不更新用户基本信息和账户信息 user.setDescription(dto.getDescription()); + user.setUserNo(dto.getUserNo());//同时更新UserNo; user.setKid(dto.getKid()); user.setDomainId(dto.getDomainId()); user.setDuty(dto.getDuty()); 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 1a3fabc5..1c5aa14b 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 @@ -177,6 +177,7 @@ public class MainDbSyncServiceImpl implements IMainDbSyncService { user.setNationality(dto.getNationality()); user.setOnline(true); user.setDeleted(false); + user.setUserType(0); accountDao.save(a); userDao.save(user); }