diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java index 7e7387a..7b5177b 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java @@ -92,19 +92,14 @@ public class PersonnelController extends CoreBaseController { ConvertBean.modelInitialize(user, AuthUtil.getSessionUser()); SysDepartment infoDepartment = personnelService.getSysDepartmentById(Long.parseLong(model.getInfoDepartmentId())); - if (infoDepartment == null) { - ValidatorBean.checkNotNull(infoDepartment, "用户主部门不存在"); - } + ValidatorBean.checkNotNull(infoDepartment, "用户主部门不存在"); SysOrganize infoOrganize = personnelService.getSysOrganizeById(infoDepartment.getOrganizeId()); + ValidatorBean.checkNotNull(infoOrganize, "用户主组织不存在"); SysPosition position = personnelService.getSysPositionById(Long.parseLong(model.getInfoPositionId())); - if (infoDepartment == null) { - ValidatorBean.checkNotNull(position, "用户主岗位存在"); - } + ValidatorBean.checkNotNull(position, "用户主岗位不存在"); SysDepartment userDepartment = personnelService.getSysDepartmentById(Long.parseLong(model.getUserDepartmentId())); - if (userDepartment == null) { - ValidatorBean.checkNotNull(userDepartment, "账号主部门不存在"); - } + ValidatorBean.checkNotNull(userDepartment, "账号主部门不存在"); SysOrganize userOrganize = personnelService.getSysOrganizeById(userDepartment.getOrganizeId()); info.setDepartmentId(infoDepartment.getId()); @@ -162,20 +157,17 @@ public class PersonnelController extends CoreBaseController { SysUser sysUser = personnelService.getSysUserById(user.getId()); SysDepartment infoDepartment = personnelService.getSysDepartmentById(Long.parseLong(model.getInfoDepartmentId())); - if (infoDepartment == null) { - ValidatorBean.checkNotNull(infoDepartment, "用户主部门不存在"); - } + ValidatorBean.checkNotNull(infoDepartment, "用户主部门不存在"); SysOrganize infoOrganize = personnelService.getSysOrganizeById(infoDepartment.getOrganizeId()); + ValidatorBean.checkNotNull(infoOrganize, "用户主组织不存在"); SysPosition position = personnelService.getSysPositionById(Long.parseLong(model.getInfoPositionId())); - if (infoDepartment == null) { - ValidatorBean.checkNotNull(position, "用户主岗位存在"); - } + ValidatorBean.checkNotNull(position, "用户主岗位不存在"); SysDepartment userDepartment = personnelService.getSysDepartmentById(Long.parseLong(model.getUserDepartmentId())); - if (userDepartment == null) { - ValidatorBean.checkNotNull(userDepartment, "账号主部门不存在"); - } + ValidatorBean.checkNotNull(userDepartment, "账号主部门不存在"); + SysOrganize userOrganize = personnelService.getSysOrganizeById(userDepartment.getOrganizeId()); + ValidatorBean.checkNotNull(userOrganize, "账号主组织不存在"); userInfo.setDepartmentId(infoDepartment.getId()); userInfo.setDepartmentNameRdd(infoDepartment.getName());