diff --git a/servers/boe-server-all/src/main/java/com/xboe/data/service/impl/DataUserSyncServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/data/service/impl/DataUserSyncServiceImpl.java index 7471a87a..970953ff 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/data/service/impl/DataUserSyncServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/data/service/impl/DataUserSyncServiceImpl.java @@ -123,19 +123,14 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService { org.setStatus(1); orgDao.save(org); } else { - int flag=0; - if (StringUtils.isNotBlank(user.getDepartName()) && !user.getDepartName().equals(org.getName())) { - org.setName(user.getDepartName()); - flag++; - } - if(StringUtils.isNotBlank(user.getOrgNamePath()) && !user.getOrgNamePath().equals(org.getNamePath())){ - org.setNamePath(user.getOrgNamePath()); - flag++; - } - if (flag>0){ - orgDao.update(org); + //该update容易发生行级锁的竞争,故作判断以减少调用 + if ((StringUtils.isNotBlank(user.getDepartName()) && !user.getDepartName().equals(org.getName())) || + (StringUtils.isNotBlank(user.getOrgNamePath()) && !user.getOrgNamePath().equals(org.getNamePath()))) { + org.setName(user.getDepartName()); + org.setNamePath(user.getOrgNamePath()); + orgDao.update(org); log.info("修改组织信息"); - } + } } } //先提交一下