Merge branch 'master' of codeup.aliyun.com:6265f483e4166464dc2f9c14/boeu/baseservers

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());

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);
 		}