|
@@ -114,6 +114,10 @@ public class UserController extends ControllerSupport {
|
|
|
bean.setName(next.getName());
|
|
|
bean.setRootOrgId(next.getRootOrgId());
|
|
|
bean.setOrgId(next.getOrgId());
|
|
|
+ Org org = orgRepo.findOne(Long.valueOf(bean.getOrgId()));
|
|
|
+ bean.setOrgName(org.getName());
|
|
|
+ Org rootOrg = orgRepo.findOne(Long.valueOf(bean.getRootOrgId()));
|
|
|
+ bean.setRootOrgName(rootOrg.getName());
|
|
|
bean.setEnable(next.getEnable());
|
|
|
|
|
|
List<UserRole> userRoles = next.getUserRoles();
|
|
@@ -133,9 +137,6 @@ public class UserController extends ControllerSupport {
|
|
|
bean.setRoleIds(roleIdList);
|
|
|
bean.setRoleCodes(roleCodeList);
|
|
|
|
|
|
- Org org = orgRepo.findOne(Long.valueOf(bean.getRootOrgId()));
|
|
|
- bean.setRootOrgName(org.getName());
|
|
|
-
|
|
|
fullUserInfoList.add(bean);
|
|
|
}
|
|
|
|