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,20 +570,20 @@
    * 分类加载时获取业务类型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(),true);
   }
@@ -639,12 +639,13 @@
    * @param oid
    * @return
    */
   public List<CodeClassifyVO> selectAllClassifyByOid(String oid){
      List<CodeClassify>  codeClassifyList=codeClassifyMapper.selectAllClassifyByOid(oid,AuthUtil.getTenantId());
   public List<CodeClassifyVO> selectAllClassifyByOid(String oid, String fieldInPath){
      List<CodeClassify>  codeClassifyList=codeClassifyMapper.selectAllClassifyByOid(oid,AuthUtil.getTenantId(),fieldInPath);
      List<CodeClassifyVO> voList = codeClassifyDO2VOs(codeClassifyList);
      return voList;

   }

   /***
    * 根据分类描述备注和库节点查询分类信息
    * @param desc
@@ -807,9 +808,8 @@
   @Override
   public List<CodeClassifyVO> listChildrenClassify(String codeClassifyOid, boolean allLevel, String fieldInPath, boolean enable) {
      if(allLevel){
         List<CodeClassify> classifyDOS = codeClassifyMapper.selectAllLevelChildHasPath(codeClassifyOid,fieldInPath);
         List<CodeClassify> classifyDOS = codeClassifyMapper.selectAllLevelChildHasPath(codeClassifyOid,fieldInPath,AuthUtil.getTenantId());
         if(!CollectionUtils.isEmpty(classifyDOS)){
            // 这儿用stream有点慢
            classifyDOS = classifyDOS.parallelStream().filter(s->FRAMEWORK_DATA_ENABLED.equalsIgnoreCase(s.getLcStatus())).collect(Collectors.toList());
         }
         return codeClassifyDO2VOs(classifyDOS);
@@ -928,7 +928,7 @@
      Map<String/**路径**/,String/**主键**/> oidPathMap = new HashMap<>();

      //我们需要查询所有已经存在的分类，主要是路径，用来判断分类的数据
      List<CodeClassify> existClassifyDOs = codeClassifyMapper.selectAllLevelChildHasPath("",null);
      List<CodeClassify> existClassifyDOs = codeClassifyMapper.selectAllLevelChildHasPath("",null,AuthUtil.getTenantId());
      Map<String/**路径**/, CodeClassify/**已经存在的数据**/> pathDOMap = Optional.ofNullable(existClassifyDOs).orElse(new ArrayList<>()).stream().collect(Collectors.toMap(s -> {
         String path = s.getPath();
         if(StringUtils.isNotBlank(path) && path.startsWith("#")){