diff --git a/src/main/java/cn/palmte/work/service/AccountService.java b/src/main/java/cn/palmte/work/service/AccountService.java index 097bffc..9dfa168 100644 --- a/src/main/java/cn/palmte/work/service/AccountService.java +++ b/src/main/java/cn/palmte/work/service/AccountService.java @@ -103,7 +103,7 @@ public class AccountService { Admin oldAdmin = adminRepository.findOne(userId); Dept dept = deptRepository.findOne(admin.getDeptId()); SysRole sysRole = sysRoleRepository.findOne(admin.getRoleId()); - UserPosition userPosition = userPositionRepository.findOne(admin.getPositionId()); +// UserPosition userPosition = userPositionRepository.findOne(admin.getPositionId()); if (oldAdmin == null) { oldAdmin = new Admin(); String userName = admin.getUserName(); @@ -115,7 +115,7 @@ public class AccountService { oldAdmin.setRealName(admin.getRealName()); oldAdmin.setDeptName(dept.getName()); - oldAdmin.setPositionName(userPosition.getPositionName()); + oldAdmin.setPositionName(admin.getPositionName()); oldAdmin.setPassword(newPassword); oldAdmin.setSalt(salt); oldAdmin.setEnabled(1); @@ -126,10 +126,10 @@ public class AccountService { } else { String userName = admin.getUserName(); oldAdmin.setDeptId(admin.getDeptId()); - oldAdmin.setPositionId(admin.getPositionId()); +// oldAdmin.setPositionId(admin.getPositionId()); oldAdmin.setRealName(admin.getRealName()); oldAdmin.setDeptName(dept.getName()); - oldAdmin.setPositionName(userPosition.getPositionName()); + oldAdmin.setPositionName(admin.getPositionName()); //oldAdmin.setEmpCode(admin.getEmpCode()); oldAdmin.setWorkLocation(admin.getWorkLocation()); oldAdmin.setDirectManager(admin.getDirectManager()); @@ -362,15 +362,15 @@ public class AccountService { throw new Exception("职位不能为空"); } - UserPosition userPosition = userPositionRepository.findByPositionNameEquals(positionName.toString()); +// UserPosition userPosition = userPositionRepository.findByPositionNameEquals(positionName.toString()); +// +// if (null == userPosition) { +// throw new Exception("职位" + positionName.toString() + "不存在"); +// } - if (null == userPosition) { - throw new Exception("职位" + positionName.toString() + "不存在"); - } - - Object sysRole = m.get("所属角色"); + Object sysRole = m.get("所属角色名称"); if (sysRole == null || StrKit.isBlank(sysRole.toString())) { - throw new Exception("所属角色不能为空"); + throw new Exception("所属角色名称不能为空"); } SysRole role = sysRoleRepository.findByNameEqualsAndDeletedEquals(sysRole.toString(), 0); @@ -393,8 +393,8 @@ public class AccountService { admin.setDeptId(dept.getId()); admin.setDeptName(dept.getName()); admin.setDirectManager(directManager.toString()); - admin.setPositionId(userPosition.getId()); - admin.setPositionName(userPosition.getPositionName()); +// admin.setPositionId(userPosition.getId()); + admin.setPositionName(positionName.toString()); admin.setRoleId(role.getId()); admin.setRoleName(role.getName()); admin.setCompanyEmail(companyEmail.toString()); diff --git a/src/main/resources/templates/admin/account_input.ftl b/src/main/resources/templates/admin/account_input.ftl index bdfdfd4..ffad074 100644 --- a/src/main/resources/templates/admin/account_input.ftl +++ b/src/main/resources/templates/admin/account_input.ftl @@ -141,22 +141,18 @@ 职位