Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java

@@ -19,10 +19,14 @@
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
import com.vci.ubcs.code.vo.pagemodel.CodeKeyAttrRepeatRuleVO;
import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
<<<<<<< Updated upstream
import com.vci.ubcs.omd.cache.EnumCache;
import com.vci.ubcs.omd.enums.EnumEnum;
import com.vci.ubcs.omd.feign.IBtmTypeClient;
import com.vci.ubcs.omd.vo.BtmTypeAttributeVO;
=======
import com.vci.ubcs.omd.feign.IBtmTypeClient;
>>>>>>> Stashed changes
import com.vci.ubcs.omd.vo.BtmTypeVO;
import com.vci.ubcs.starter.bo.WriteExcelData;
import com.vci.ubcs.starter.exception.VciBaseException;
@@ -77,7 +81,19 @@
   private ICodeRuleService codeRuleService;

   @Resource
<<<<<<< Updated upstream
   private IBtmTypeClient btmTypeClient;
=======
   private CodeOsbtmtypeMapper codeOsbtmtypeMapper;

   @Resource
   private CodeOsbtmtypeattributeMapper codeOsbtmtypeattributeMapper;

   @Resource
   private IBtmTypeClient btmTypeClient;


>>>>>>> Stashed changes

   /**
    * 日志
@@ -1031,7 +1047,11 @@
   }

   /**
<<<<<<< Updated upstream
    * 主题库的树,已联调业务类型查询feign
=======
    * 主题库的树,已经联调业务类型查询
>>>>>>> Stashed changes
    *
    * @param treeQueryObject 树形查询对象
    * @return 主题库显示树
@@ -1053,6 +1073,7 @@
      if(Func.isEmpty(btmTypeVOS) || Func.isEmpty(trees)){
         return null;
      }
<<<<<<< Updated upstream
      List<Tree> treeList = trees.stream().filter(tree -> !CollectionUtils.isEmpty(btmTypeVOS.stream().filter(btmType -> {
               if(Objects.equals(tree.getAttributes().get("id"), btmType.getId())){
                  tree.getAttributes().put("btmTypeOid",btmType.getOid());
@@ -1061,6 +1082,10 @@
               return false;
            }).collect(Collectors.toList())))
         .collect(Collectors.toList());
=======
      List<Tree> treeList = trees.stream().filter(tree -> btmTypeVOS.stream().
         anyMatch(btmType -> Objects.equals(tree.getAttributes().get("id"), btmType.getId()))).collect(Collectors.toList());
>>>>>>> Stashed changes
      return treeList;
   }