Commit 83d03cac authored by tianyiming's avatar tianyiming

fix(core): 修复公司代码查询逻辑中的拼写错误

parent b020e6c6
......@@ -1091,10 +1091,10 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
List<String> post = this.getPostByType(type);
SortVo sortMap = this.sortFieldConversion(sort);
if (!ObjectUtils.isEmpty(filter.getSuperviseOrgCode())) {
FeignClientResult<CompanyModel> result = Privilege.companyClient.queryByOrgcode(filter.getSuperviseOrgCode());
if (result.getStatus() == 200 ){
filter.setSuperviseCompanyCode(result.getResult().getCompanyCode());
}
HashMap<String, Object> parentMessage = (HashMap<String, Object>) Privilege.companyClient.queryByOrgcode(filter.getSuperviseOrgCode()).getResult();
// 目前平台返回key为compnay(存在拼写错误)
CompanyModel parentModel = JSON.parseObject(JSON.toJSONString(parentMessage.get("compnay")), CompanyModel.class);
filter.setSuperviseCompanyCode(parentModel.getCompanyCode());
}
Page<UserPermissionDto> result = this.getBaseMapper().queryUserByPermissionPage(permissionDtoPage, post, filter, sortMap);
result.getRecords().forEach(d -> {
......@@ -2842,11 +2842,10 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
// 属地监管部门
if (!ObjectUtils.isEmpty(map.get("superviseOrgCode"))) {
String superviseOrgCode = map.get("superviseOrgCode");
FeignClientResult<CompanyModel> feignClientResult = Privilege.companyClient.queryByOrgcode(superviseOrgCode);
String companyCode = null;
if (ObjectUtils.isEmpty(feignClientResult) && feignClientResult.getStatus() == 200) {
companyCode = feignClientResult.getResult().getCompanyCode();
}
HashMap<String, Object> parentMessage = (HashMap<String, Object>) Privilege.companyClient.queryByOrgcode(superviseOrgCode).getResult();
// 目前平台返回key为compnay(存在拼写错误)
CompanyModel parentModel = JSON.parseObject(JSON.toJSONString(parentMessage.get("compnay")), CompanyModel.class);
String companyCode = parentModel.getCompanyCode();
BoolQueryBuilder queryBuilder1 = QueryBuilders.boolQuery();
BoolQueryBuilder queryBuilder2 = QueryBuilders.boolQuery();
EnhancedDynamicQueryBuilder enhancedDynamicQueryBuilder = new EnhancedDynamicQueryBuilder();
......
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