Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManagerImpl.java =================================================================== diff -u -r19682 -r20452 --- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManagerImpl.java (.../DataSynchronizationManagerImpl.java) (revision 19682) +++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManagerImpl.java (.../DataSynchronizationManagerImpl.java) (revision 20452) @@ -541,11 +541,18 @@ } //如果用户被锁定了, 则不允许修改 - if (userOrgRelationExist || isLockStatus) { + if (isLockStatus) { continue; } - + + //修改人员信息 + userManager.createOrUpdate(vo.coding, vo.name, vo.getStatus(), null, 默认角色ID, map); + //如果该人员与该组织关系已存在,则不调整人员与组织机构关联表 + if (userOrgRelationExist) { + continue; + } + OrgUnit parent = (OrgUnit)orgUnitManager.getOrgUnitByCode(vo.orgUnitCoding); //根据his系统用户和科室的关系,查看此关系在我们系统是否也存在 if(parent == null){ parent = (OrgUnit)orgUnitManager.getOrgUnitByCode(默认父节点的编码);