diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeService.java index 6e6bc54..1c6665f 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeService.java @@ -237,8 +237,19 @@ public class CoreTreeService implements ICoreTreeService { @Override @ApiOperation(value = "父节点检查",notes = "检查组织的父节点是否是当前节点的子节点") public void doValidatorSysOrganizeParentId(SysOrganize organize) { - findSysOrganizeChildrenTreePack(organize,0); - validatorSysOrganizeParentId(organize.getChildList(),organize.getParentId()); + if(organize != null){ + if(organize.getParentId().longValue() == organize.getId().longValue()){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("上级组织不能为当前组织") + .setErrorSolution("请重新操作") + .build(); + } + + findSysOrganizeChildrenTreePack(organize,0); + validatorSysOrganizeParentId(organize.getChildList(),organize.getParentId()); + } } @Override diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPositionService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPositionService.java index b0275d7..410a985 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPositionService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPositionService.java @@ -109,7 +109,7 @@ public class SysPositionService implements ISysPositionService { LOGGER.info("岗位信息 POSITION position:{}", position); positionRDao.update(position); // 修改冗余信息 - personnelService.refreshRefSysUserInfoPositionRdd(position.getId()); +// personnelService.refreshRefSysUserInfoPositionRdd(position.getId()); } @Override diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java index 4b5acb1..fe3046e 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java @@ -177,15 +177,14 @@ public class SysUserService implements ISysUserService { @ApiOperation(value = "刷新账号", notes = "刷新账号登录信息") public void refreshUserLoginInformation(Long userId) { SysUser user = sysUserRDao.getById(userId); - SysUserInfo userInfo = sysUserInfoRDao.getById(user.getUserInfoId()); - user.setUserLoginLastDateTime(TimeTool.getNowTime(true)); user.setUserLoginNum(user.getUserLoginNum() + 1); + sysUserRDao.save(user); + + SysUserInfo userInfo = sysUserInfoRDao.getById(user.getUserInfoId()); userInfo.setUserLoginLastDateTime(TimeTool.getNowTime(true)); userInfo.setUserLoginNum(userInfo.getUserLoginNum() + 1); - sysUserInfoRDao.save(userInfo); - sysUserRDao.save(user); } @Override