Commit 83d03cac authored by tianyiming's avatar tianyiming

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

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