hz/java-servers
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git synced 2025-12-14 05:16:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

用户同步，增加对kid的判断

Browse Source
This commit is contained in:
daihh
2022-12-06 18:25:57 +08:00
parent 53a9508c35
commit 004545d3db
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
servers/boe-server-basic/src/main/java/com/xboe/basic/service/impl/BasicDataSyncServiceImpl.java
View File

@@ -168,6 +168,10 @@ public class BasicDataSyncServiceImpl implements IBasicDataSyncService{
} }
//同一个用户工号对应 多个kid的情况,所以直接根据kid查询是不对的,所以这里按工号查询,不使用kid //同一个用户工号对应 多个kid的情况,所以直接根据kid查询是不对的,所以这里按工号查询,不使用kid
User user = userDao.findOne(FieldFilters.eq("userNo", dto.getUserNo())); 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) { if(user==null) {
//人员基本信息 //人员基本信息
Person person=new Person(); Person person=new Person();
@@ -230,8 +234,6 @@ public class BasicDataSyncServiceImpl implements IBasicDataSyncService{
user.setPayrollPlaceId(dto.getPayrollPlaceId()); user.setPayrollPlaceId(dto.getPayrollPlaceId());
user.setPayrollPlaceName(dto.getPayrollPlaceName()); user.setPayrollPlaceName(dto.getPayrollPlaceName());
user.setEmployeeStatus(dto.getEmployeeStatus()); user.setEmployeeStatus(dto.getEmployeeStatus());
if(user.getStatus()==null) { if(user.getStatus()==null) {
user.setStatus(1);//如果为空，就是正常 user.setStatus(1);//如果为空，就是正常
} }
@@ -253,6 +255,7 @@ public class BasicDataSyncServiceImpl implements IBasicDataSyncService{
}else { }else {
//更新时不更新用户基本信息和账户信息 //更新时不更新用户基本信息和账户信息
user.setDescription(dto.getDescription()); user.setDescription(dto.getDescription());
user.setUserNo(dto.getUserNo());//同时更新UserNo;
user.setKid(dto.getKid()); user.setKid(dto.getKid());
user.setDomainId(dto.getDomainId()); user.setDomainId(dto.getDomainId());
user.setDuty(dto.getDuty()); user.setDuty(dto.getDuty());

1
servers/boe-server-basic/src/main/java/com/xboe/primary/service/impl/MainDbSyncServiceImpl.java
View File

@@ -177,6 +177,7 @@ public class MainDbSyncServiceImpl implements IMainDbSyncService {
user.setNationality(dto.getNationality()); user.setNationality(dto.getNationality());
user.setOnline(true); user.setOnline(true);
user.setDeleted(false); user.setDeleted(false);
user.setUserType(0);
accountDao.save(a); accountDao.save(a);
userDao.save(user); userDao.save(user);
} }