Commit 122aec97 authored by chenhao's avatar chenhao

bug 4101 解决

parent 81bf8cf5
...@@ -218,7 +218,7 @@ public interface IOrgUsrService { ...@@ -218,7 +218,7 @@ public interface IOrgUsrService {
/** /**
* 根据登陆人获取公司列表(关联重点部位) * 根据登陆人获取公司列表(关联重点部位)
*/ */
List<CheckObjectDto> companyListByUser(AgencyUserModel user); List<CheckObjectDto> companyListByUser(AgencyUserModel user,String bizOrgCode);
/** /**
* 获取登陆人关联机场单位人员信息,部门信息 * 获取登陆人关联机场单位人员信息,部门信息
......
...@@ -502,9 +502,10 @@ public class OrgUsrController extends BaseController { ...@@ -502,9 +502,10 @@ public class OrgUsrController extends BaseController {
@RequestMapping(value = "/companyListByUser", method = RequestMethod.GET) @RequestMapping(value = "/companyListByUser", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据登陆人获取单位列表", notes = "根据登陆人获取单位列表") @ApiOperation(httpMethod = "GET", value = "根据登陆人获取单位列表", notes = "根据登陆人获取单位列表")
public ResponseModel<List<CheckObjectDto>> companyListByUser() { public ResponseModel<List<CheckObjectDto>> companyListByUser() {
String bizOrgCodeString= getOrgCode();
// 获取登陆人角色 // 获取登陆人角色
AgencyUserModel user = getUserInfo(); AgencyUserModel user = getUserInfo();
List<CheckObjectDto> menus = iOrgUsrService.companyListByUser(user); List<CheckObjectDto> menus = iOrgUsrService.companyListByUser(user,bizOrgCodeString);
return ResponseHelper.buildResponse(menus); return ResponseHelper.buildResponse(menus);
} }
......
...@@ -1455,7 +1455,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -1455,7 +1455,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
} }
@Override @Override
public List<CheckObjectDto> companyListByUser(AgencyUserModel user) { public List<CheckObjectDto> companyListByUser(AgencyUserModel user,String bizOrgCode) {
List<CheckObjectDto> list = new ArrayList<>(); List<CheckObjectDto> list = new ArrayList<>();
// 需要角色为机场单位或管理员,其余角色返回空 // 需要角色为机场单位或管理员,其余角色返回空
String code = UserRolesEnum.AIRPORTUNIT.getCode(); String code = UserRolesEnum.AIRPORTUNIT.getCode();
...@@ -1487,10 +1487,11 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -1487,10 +1487,11 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
} }
}); });
// 返回所在用户单位列表 // 返回所在用户单位列表
return list.stream().distinct().collect(Collectors.toList()); List<CheckObjectDto> lists = list.stream().distinct().collect(Collectors.toList());
return lists.stream().filter(i-> !i.getBizOrgCode().equals(bizOrgCode)).collect(Collectors.toList());
} }
} }
return list; return list.stream().filter(i-> !i.getBizOrgCode().equals(bizOrgCode)).collect(Collectors.toList());
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment