|
@@ -268,7 +268,7 @@ public class UserController extends ControllerSupport {
|
|
|
public Map<String, Object> addUser(@RequestBody UserFormDomain userForm) {
|
|
|
trim(userForm);
|
|
|
userForm.setId(null);
|
|
|
- return insertOrUpdateUser(userForm);
|
|
|
+ return saveUser(userForm);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -297,7 +297,7 @@ public class UserController extends ControllerSupport {
|
|
|
|
|
|
userForm.setPassword(userEntity.getPassword());
|
|
|
|
|
|
- return insertOrUpdateUser(userForm);
|
|
|
+ return saveUser(userForm);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -307,8 +307,8 @@ public class UserController extends ControllerSupport {
|
|
|
* @param userForm
|
|
|
* @return
|
|
|
*/
|
|
|
- private Map<String, Object> insertOrUpdateUser(UserFormDomain userForm) {
|
|
|
- cn.com.qmth.examcloud.commons.web.security.bean.User accessUser = getAccessUser();
|
|
|
+ private Map<String, Object> saveUser(UserFormDomain userForm) {
|
|
|
+ User accessUser = getAccessUser();
|
|
|
Long rootOrgId = userForm.getRootOrgId();
|
|
|
OrgEntity rootOrg = orgRepo.findOne(rootOrgId);
|
|
|
if (null == rootOrg) {
|