1、租户拼接问题修改。
2、http请求头加鉴权失败问题修改。
| | |
| | | * 添加请求头信息 |
| | | */ |
| | | if(headers!=null&&headers.size()>0) { |
| | | for (Map.Entry<String, String> entry : params.entrySet()) { |
| | | for (Map.Entry<String, String> entry : headers.entrySet()) { |
| | | httpGet.addHeader(entry.getKey(), entry.getValue()); |
| | | } |
| | | } |
| | |
| | | if(StringUtils.isNotBlank(libName)){ |
| | | libNameList=VciBaseUtil.str2List(libName); |
| | | } |
| | | List<CodeClassify> doList =codeClassifyMapper.getRMLibByName(libNameList,"Enabled",AuthUtil.getTenantId()); |
| | | List<CodeClassify> doList =codeClassifyMapper.getRMLibByName(libNameList,"Enabled",AuthUtil.getTenantId() |
| | | .equals( |
| | | nacosConfigCache |
| | | .getAdminUserInfo() |
| | | .getTenantId() |
| | | ) ? null:AuthUtil.getTenantId()); |
| | | List<CodeClassifyVO> voList = codeClassifyDO2VOs(doList); |
| | | return voList; |
| | | } |
| | |
| | | //备注 |
| | | cbo.setDescription(orderDTO.getDescription()); |
| | | cboList.add(cbo); |
| | | // |
| | | // cboList.add(cbo); |
| | | |
| | | List<String> codeList = productCodeService.productCodeAndSaveData(classifyFullInfo, templateVO, ruleVO, orderDTO.getSecDTOList(), cboList); |
| | | |
| | | |
| | | // List<String> charList = new ArrayList<>(); |
| | | // for (BaseModel baseModel : cboList) { |
| | | // charList.add(baseModel.getId()); |
| | | // } |
| | | batchSaveSelectChar(templateVO, cboList); |
| | | return codeList.size() > 0 ? codeList.get(0) : ""; |
| | | // return null; |
| | | } |
| | | |
| | | /** |
| | |
| | | </foreach> |
| | | </if> |
| | | <if test="tenantId != null and tenantId != ''"> |
| | | codeclassify0.tenant_id = #{tenantId} |
| | | and codeclassify0.tenant_id = #{tenantId} |
| | | </if> |
| | | order by id asc |
| | | </select> |