Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/LinkTypeServiceImpl.java

@@ -395,7 +395,7 @@
         LinkType linkTypeDO = new LinkType();
         BeanUtil.copy(linkTypeVO, linkTypeDO);
         if (StringUtils.isBlank(linkTypeDO.getTableName())){
            linkTypeDO.setTableName(getTableName(linkTypeDO.getId(),linkTypeDO.getDomain()));
            linkTypeDO.setTableName(getTableName(linkTypeDO.getId(),linkTypeDO.getBizDomain()));
         }
         String creator = AuthUtil.getUserAccount();
         Date now = new Date();
@@ -411,7 +411,7 @@
            List<LinkTypeAttributeVO> attributes = typeVO.getAttributes();
            attributes.addAll(linkTypeAttributeService.getDefaultAttributes(typeVO));
            typeVO.setAttributes(attributes);
            R r = DomainRepeater.submitLinkType(typeVO.getDomain(), typeVO);
            R r = DomainRepeater.submitLinkType(typeVO.getBizDomain(), typeVO);
            if (!r.isSuccess()){
               dataSourceTransactionManager.rollback(transaction);
            }else {
@@ -571,7 +571,7 @@
            attributes.addAll(defaultAttributes);
            linkTypeVO.setAttributes(attributes);
            BtmAndLinkTypeDdlDTO ddlDTO = new BtmAndLinkTypeDdlDTO();
            DomainRepeater.checkDifferent(ddlDTO,linkTypeVO.getDomain());
            DomainRepeater.checkDifferent(ddlDTO,linkTypeVO.getBizDomain());
            dataSourceTransactionManager.commit(transaction);
         }
      } catch (Throwable e){
@@ -625,10 +625,10 @@
         List<TableCheckDTO> checkList = linkTypeDOList.stream().map(linkType -> {
            TableCheckDTO tableCheckDTO = new TableCheckDTO();
            tableCheckDTO.setBtmName(linkType.getId());
            tableCheckDTO.setTableName(getTableName(linkType.getId(),linkType.getDomain()));
            tableCheckDTO.setTableName(getTableName(linkType.getId(),linkType.getBizDomain()));
            tableCheckDTO.setCheckTableHasData(true);
            tableCheckDTO.setNeedDelete(true);
            tableCheckDTO.setDomain(linkType.getDomain());
            tableCheckDTO.setDomain(linkType.getBizDomain());
            return tableCheckDTO;
         }).collect(Collectors.toList());
         R result = DomainRepeater.checkTableHasDataByTableNameThenDrop(checkList);
@@ -877,7 +877,10 @@
      try {
         Map<String, String> domain = Optional.ofNullable(DomainRepeater.getDomain()).orElseGet(ArrayList::new).stream().collect(Collectors.toMap(DomainVO::getValue, DomainVO::getLabel));
         List<LinkTypeVO> vos = LinkTypeWrapper.build().listEntityVO(baseMapper.selectAll(), null);
         Map<String, List<LinkTypeVO>> domainMap = vos.stream().collect(Collectors.groupingBy(LinkTypeVO::getDomain));
         if (CollectionUtils.isEmpty(vos)){
            return new ArrayList<>();
         }
         Map<String, List<LinkTypeVO>> domainMap = Optional.ofNullable(vos).orElseGet(ArrayList::new).stream().collect(Collectors.groupingBy(LinkTypeVO::getBizDomain));
         List<BtmTreeVO> treeList = new ArrayList<>();
         domainMap.forEach((k,v)-> {
            if (domain.containsKey(k)){
@@ -885,6 +888,7 @@
               BtmTreeVO parent = new BtmTreeVO();
               parent.setName(label);
               parent.setId(k);
               parent.setLevel(1);
               parent.setLabel(label);
               parent.setChildList(v.stream().map(s -> {
                  BtmTreeVO child = new BtmTreeVO();
@@ -892,6 +896,7 @@
                  child.setLabel(s.getId() + (s.getName() == null ? "" : "(" + s.getName() + ")"));
                  child.setId(s.getId());
                  child.setName(s.getName());
                  child.setLevel(2);
                  return child;
               }).collect(Collectors.toList()));
               treeList.add(parent);