From 1da559dd7a27026f79b9cc8e8c242d3368aac81f Mon Sep 17 00:00:00 2001
From: "wei.peng" <123456>
Date: Mon, 16 Mar 2020 14:23:12 +0800
Subject: [PATCH] =?UTF-8?q?Bug=20=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/busi/PersonnelController.java       | 28 ++++++++--------------
 1 file changed, 10 insertions(+), 18 deletions(-)

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