diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java index f069edd..b1b1010 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java @@ -452,7 +452,7 @@ public class UsersController extends BaseController { for (Integer roleMaps : userRoleMapses) { Roles roles1 = rolesService.getRoles(roleMaps); if (roles1 != null && StringUtils.isNotEmpty(orgId)) { - if(roles1.getOrgId() == null||roles1.getOrgId() == rog){ + if (roles1.getOrgId() == null || roles1.getOrgId() == rog) { roles.add(roles1); } } @@ -484,14 +484,14 @@ public class UsersController extends BaseController { //是否是建档医院 users.setbStatus(organization.getbStatus()); - String hospital=autoMatchFacade.getHospitalId(loginContext.getId()); + String hospital = autoMatchFacade.getHospitalId(loginContext.getId()); //设置建档方式 - String groupId= groupsFacade.findByCurrentUserId(hospital); - Integer bType= GroupEnums.BuildType.SINGLE.getbType(); - if(StringUtils.isNotEmpty(groupId)){ - OrganizationGroups groups= groupsService.findById(groupId); - if(null!=groups){ - bType= groups.getbType(); + String groupId = groupsFacade.findByCurrentUserId(hospital); + Integer bType = GroupEnums.BuildType.SINGLE.getbType(); + if (StringUtils.isNotEmpty(groupId)) { + OrganizationGroups groups = groupsService.findById(groupId); + if (null != groups) { + bType = groups.getbType(); } } users.setbType(bType); @@ -1175,4 +1175,26 @@ public class UsersController extends BaseController { result.put("errormsg", "update"); return result; } + + @RequestMapping(value = "/getUserById", method = RequestMethod.GET) + @ResponseBody + public Map getUser(@RequestParam("id") String id) { + Map result = new HashMap<>(); + Users users = usersService.getUsers(Integer.valueOf(id)); + result.put("errorcode", ConstantInterface.BUSINESS_ERROR); + result.put("errormsg", "数据不存在"); + if (null != users) { + Departments departments = departmentsService.getDepartments(users.getKsId()); + Organization organization = organizationService.getOrganization(users.getOrgId()); + if (null != organization) { + result.put("hName", organization.getName()); + } + result.put("errorcode", ConstantInterface.SUCCESS); + result.put("errormsg", "成功"); + if (null != departments) { + result.put("kName", departments.getName()); + } + } + return result; + } }