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

@@ -567,6 +567,9 @@
                     List<CodeOrderSecDTO> codeOrderSecDTOList=new ArrayList<>();
                     orderDTO.setCodeClassifyOid(codeClassifyVO.getOid());//分类主键
                     orderDTO.setTemplateOid(templateVO.getOid());
                     orderDTO.setCreator(rowData.getCreator());
                     orderDTO.setLastModifier(rowData.getEditor());
                     orderDTO.setLcStatus(rowData.getStatus());
                     if(!CollectionUtils.isEmpty(ruleVO.getSecVOList())) {
                        ruleVO.getSecVOList().stream().forEach(codeBasicSecVO -> {
                           if (codeBasicSecVO.getSecType().equals("codevariablesec")) {//规则之定义为可变码段存储主数据传递过来的数据
@@ -581,7 +584,7 @@
                     orderDTO.setCodeRuleOid(ruleVO.getOid());
                     orderDTO.setSecDTOList(codeOrderSecDTOList);//存储编码
                     orderDTO.setData(rowData.getFiledValue());
                     String code=engineService.addSaveCode(orderDTO);
                     String code=engineService.addSaveCodeNotauthUser(orderDTO,false);
                     if(StringUtils.isNotBlank(code)) {
                        StringBuffer sqlsb = new StringBuffer();
                        sqlsb.append(" select * from ");
@@ -836,6 +839,9 @@
                     List<CodeOrderSecDTO> codeOrderSecDTOList=new ArrayList<>();
                     orderDTO.setCodeClassifyOid(codeClassifyVO.getOid());//分类主键
                     orderDTO.setTemplateOid(templateVO.getOid());
                     orderDTO.setCreator(rowData.getCreator());
                     orderDTO.setLastModifier(rowData.getEditor());
                     orderDTO.setLcStatus(rowData.getStatus());
                     if(!CollectionUtils.isEmpty(ruleVO.getSecVOList())) {
                        ruleVO.getSecVOList().stream().forEach(codeBasicSecVO -> {
                           if (codeBasicSecVO.getSecType().equals("codevariablesec")) {//规则之定义为可变码段存储主数据传递过来的数据
@@ -850,7 +856,7 @@
                     orderDTO.setCodeRuleOid(ruleVO.getOid());
                     orderDTO.setSecDTOList(codeOrderSecDTOList);//存储编码
                     orderDTO.setData(rowData.getFiledValue());
                     String code=engineService.addSaveCode(orderDTO);
                     String code=engineService.addSaveCodeNotauthUser(orderDTO,false);
                     if(StringUtils.isNotBlank(code)) {
                        StringBuffer sqlsb = new StringBuffer();
                        sqlsb.append(" select * from ");
@@ -1214,10 +1220,10 @@
                  throw new Throwable(msg);
               }
            } else {
               TreeQueryObject treeQueryObject = new TreeQueryObject();
               /*TreeQueryObject treeQueryObject = new TreeQueryObject();
               treeQueryObject.setParentOid(oid);
               treeQueryObject.setQueryAllLevel(true);
               codeClassifyVOS = classifyService.selectCodeClassifyDOByTree(treeQueryObject);
               treeQueryObject.setQueryAllLevel(true);*/
               codeClassifyVOS = classifyService.getIdPathToNamePathByParentId(oid,false);
            }
         }else{
            errorid = "101";
@@ -1237,7 +1243,7 @@
               classifyVO.setDescription(codeClassifyDO.getDescription());
               classifyVO.setName(codeClassifyDO.getName());
               classifyVO.setPid(codeClassifyDO.getParentCodeClassifyOid());
               classifyVO.setFullPathName(codeClassifyDO.getPath());
               classifyVO.setFullPathName(codeClassifyDO.getNamePath());
               classifyVOList.add(classifyVO);
            });
            libraryVo.setClassify(classifyVOList);
@@ -1288,7 +1294,7 @@
      boolean issucess=false;
      String resultStr = "";
      String errorid="0";
      msg="成功";
      msg = "数据查询成功";
      String systemId="";
      log.info("查询分类的数据参数:->"+data);
      log.info("查询分类的数据类型:->"+dataType);
@@ -1375,8 +1381,8 @@
               TreeQueryObject treeQueryObject=new TreeQueryObject();
               treeQueryObject.setParentOid(oid);
               treeQueryObject.setQueryAllLevel(true);
               dataCodeClassifyVOList=classifyService.selectCodeClassifyDOByTree(treeQueryObject);
               dataCodeClassifyVOList.add(CodeClassifyWrapper.build().entityVO(currentCodeClassify[0]));
               dataCodeClassifyVOList=classifyService.selectAllClassifyByOid(oid,"oid");//.selectCodeClassifyDOByTree(treeQueryObject);
               //dataCodeClassifyVOList.add(CodeClassifyWrapper.build().entityVO(currentCodeClassify[0]));
               Map<String, CodeClassifyVO> oidCodeclassifyDOMap = dataCodeClassifyVOList.stream().filter(systeDataObject -> systeDataObject != null && StringUtils.isNotBlank(systeDataObject.getOid())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getOid(), t -> t));

               List<PropertyVO>  propertyVOS=condtionVO.getPro();
@@ -1453,6 +1459,9 @@
                     dataObjectVOS.add(dataObjectVO);
                  });
                  resultDataVO.setObject(dataObjectVOS);
               }else{
                  errorid = "0";
                  msg = "接口参数：classCode 未查询到对应的数据";
               }
            }else{
               errorid = "101";
@@ -1463,8 +1472,6 @@
            errorid = "101";
            msg = "接口参数：library 未查询到对应的库节点信息";
         }
         errorid = "0";
         msg = "数据查询成功";
      }catch (Throwable e){
         e.printStackTrace();;
         msg="查询数据失败:"+e.getMessage();