From 2c6c24281d4c261b172d02a98df9524cffc0c276 Mon Sep 17 00:00:00 2001 From: fujunling <2984387807@qq.com> Date: 星期二, 18 七月 2023 11:04:39 +0800 Subject: [PATCH] fjl --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java index 1f1a0bc..1c251ee 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java @@ -714,7 +714,7 @@ //杩欎釜涓氬姟绫诲瀷涓嬬殑鎵�鏈夊睘鎬� R<BtmTypeVO> btmTypeVOR = btmTypeClient.getAllAttributeByBtmId(codeClassifyTemplateDO.getBtmTypeId()); if(btmTypeVOR.getCode() != 200){ - throw new ServiceException("涓氬姟绫诲瀷feign璋冪敤澶辫触锛�"); + throw new ServiceException("涓氬姟绫诲瀷feign璋冪敤閿欒锛�"); } //杩欎釜妯℃澘涓嬪凡缁忔湁鐨勫睘鎬� @@ -724,16 +724,16 @@ condition.put("CLASSIFYTEMPLATEOID",templateAttrOid); List<CodeClassifyTemplateAttr> codeClassifyTemplateAttrDOList = baseMapper.selectByMap(condition); - List<String> btmOids = new ArrayList<String>(); + List<String> btmIds = new ArrayList<String>(); for (CodeClassifyTemplateAttr codeClassifyTemplateAttrDO:codeClassifyTemplateAttrDOList){ - btmOids.add(codeClassifyTemplateAttrDO.getId()); + btmIds.add(codeClassifyTemplateAttrDO.getId()); } //杩囨护鎺夊凡缁忓瓨鍦ㄧ殑灞炴�� List<BtmTypeAttributeVO> boAttrss = new ArrayList<BtmTypeAttributeVO>(); for (BtmTypeAttributeVO osBtmTypeAttributeVO:btmTypeVOR.getData().getAttributes()){ - if(!btmOids.contains(osBtmTypeAttributeVO.getId())){ + if(!btmIds.contains(osBtmTypeAttributeVO.getId())){ //鐪嬬湅鏄笉鏄湁妯$硦鏌ヨ boolean inSearch = true; if(StringUtils.isNotBlank(name) && !osBtmTypeAttributeVO.getName().contains(name.replace("*",""))){ -- Gitblit v1.9.3