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

@@ -528,14 +528,14 @@
         lcStatus = treeQueryObject.getConditionMap().getOrDefault("lcStatus",null);
      }
      if(StringUtils.isNotBlank(id) || StringUtils.isNotBlank(lcStatus) ){
         String tableName = this.getTableName(treeQueryObject.getParentOid(),treeQueryObject.getConditionMap().get("id"), treeQueryObject.getConditionMap().get("lcStatus"));
         //String tableName = this.getTableName(treeQueryObject.getConditionMap().get("btmTypeId"),treeQueryObject.getConditionMap().get("id"), treeQueryObject.getConditionMap().get("lcStatus"));
         doList = codeClassifyMapper
            .selectCodeClassifyDOByTree(
               treeQueryObject.getConditionMap().get("id"),
               treeQueryObject.getConditionMap().get("lcStatus"),
               treeQueryObject.getParentOid(),
               VciBaseUtil.checkAdminTenant() ? null:AuthUtil.getTenantId(),
               tableName
               VciBaseUtil.checkAdminTenant() ? null:AuthUtil.getTenantId()
               /*tableName*/
            );
      }else{
         // 只要前端会传参数过来就不会出现走这句的情况，所以查询总数没在这儿添加
@@ -570,22 +570,22 @@
    * 分类加载时获取业务类型id，拼接业务类型表名
    * @return
    */
   private String getTableName(String parentCodeClassifyOid,String id,String lcStatus){
   private String getTableName(String btmTypeId,String id,String lcStatus){
      if(Func.isNotEmpty(btmTypeId)){
         return VciBaseUtil.getTableName(btmTypeId,true);
      }
      LambdaQueryWrapper<CodeClassify> wrapper = Wrappers.<CodeClassify>query()
         .lambda().select(CodeClassify::getBtmTypeId)
         .eq(CodeClassify::getLcStatus, lcStatus)
         .isNotNull(CodeClassify::getBtmTypeId)
         .last("limit 1");
      if(Func.isNotBlank(id)){
         wrapper.eq(CodeClassify::getId,id).isNull(CodeClassify::getParentCodeClassifyOid);
      }else{
         wrapper.eq(CodeClassify::getParentCodeClassifyOid,parentCodeClassifyOid);
      }
         .last("limit 1")
         .eq(CodeClassify::getId,id).isNull(CodeClassify::getParentCodeClassifyOid);

      CodeClassify codeClassify = codeClassifyMapper.selectOne(wrapper);
      if(Func.isEmpty(codeClassify) || Func.isEmpty(codeClassify.getBtmTypeId())){
         throw new ServiceException("查询主数据总数时，未获取业务类型ID！");
         throw new ServiceException("查询主数据总数时，未获取到业务类型ID！");
      }
      return VciBaseUtil.getTableName(codeClassify.getBtmTypeId().toLowerCase(Locale.ROOT),true);
      return VciBaseUtil.getTableName(codeClassify.getBtmTypeId(),true);
   }

   /**
@@ -1264,7 +1264,7 @@
         return null;
      }
      List<Tree> treeList = trees.stream().filter(tree -> !CollectionUtils.isEmpty(btmTypeVOS.stream().filter(btmType -> {
               if(Objects.equals(tree.getAttributes().get("id"), btmType.getId())){
               if(Objects.equals(tree.getAttributes().get("btmTypeId"), btmType.getId())){
                  tree.getAttributes().put("btmTypeOid",btmType.getOid());
                  return true;
               }