lib文件上传

 Bin/lib/client/flatlaf-2.3.jar

Binary files differ

 Bin/lib/client/icegridgui.jar

Binary files differ

 Bin/lib/client/jgoodies-common-1.8.1.jar

Binary files differ

 Bin/lib/client/jgoodies-looks-2.5.3.jar

Binary files differ

 Bin/lib/client/jgraph.jar

Binary files differ

 Bin/lib/client/jgraphx-3.1.0.0.jar

Binary files differ

 Bin/lib/client/nativeskin.jar

Binary files differ

 Bin/lib/client/pinyin4j-2.5.0.jar

Binary files differ

 Bin/lib/client/plt-client.jar

Binary files differ

 Bin/lib/client/plt-clientbase.jar

Binary files differ

 Bin/lib/client/poi-3.9-20121203.jar

Binary files differ

 Bin/lib/client/poi-ooxml-3.9-20121203.jar

Binary files differ

 Bin/lib/client/poi-ooxml-schemas-3.9-20121203.jar

Binary files differ

 Bin/lib/client/poi-scratchpad-3.9-20121203.jar

Binary files differ

 Bin/lib/client/protege35.jar

Binary files differ

 Bin/lib/client/skinlf.jar

Binary files differ

 Bin/lib/client/swingx-1.6.1.jar

Binary files differ

 Bin/lib/client/swixml.jar

Binary files differ

 Bin/lib/client/uitheme-1.3.1.jar

Binary files differ

 Bin/lib/common/commons-lang3-3.1.jar

Binary files differ

 Bin/lib/common/dom4j-1.6.1.jar

Binary files differ

 Bin/lib/common/fastjson-1.2.83.jar

Binary files differ

 Bin/lib/common/freemarker.jar

Binary files differ

 Bin/lib/common/icegridgui.jar

Binary files differ

 Bin/lib/common/junit-4.8.jar

Binary files differ

 Bin/lib/common/log4j-api-2.12.4.jar

Binary files differ

 Bin/lib/common/log4j-core-2.12.4.jar

Binary files differ

 Bin/lib/common/mail.jar

Binary files differ

 Bin/lib/common/plt-common.jar

Binary files differ

 Bin/lib/common/plt-slice.jar

Binary files differ

 Bin/lib/service/BOFService.jar

Binary files differ

 Bin/lib/service/CacheService.jar

Binary files differ

 Bin/lib/service/FrameService.jar

Binary files differ

 Bin/lib/service/OMDService.jar

Binary files differ

 Bin/lib/service/OQService.jar

Binary files differ

 Bin/lib/service/ServiceBase.jar

Binary files differ

 Bin/lib/service/UIService.jar

Binary files differ

 Bin/lib/service/VciServiceMain.jar

Binary files differ

 Bin/lib/service/VolumeService.jar

Binary files differ

 Bin/lib/service/WFPlugins.jar

Binary files differ

 Bin/lib/service/WFService.jar

Binary files differ

 Bin/lib/thrid/IKAnalyzer2012FF_u1.jar

Binary files differ

 Bin/lib/thrid/XmlSchema-1.1.jar

Binary files differ

 Bin/lib/thrid/activation.jar

Binary files differ

 Bin/lib/thrid/antlr-2.7.6.jar

Binary files differ

 Bin/lib/thrid/avalon-framework-4.1.5.jar

Binary files differ

 Bin/lib/thrid/axis-ant.jar

Binary files differ

 Bin/lib/thrid/axis.jar

Binary files differ

 Bin/lib/thrid/bsf-2.3.0.jar

Binary files differ

 Bin/lib/thrid/bsh.jar

Binary files differ

 Bin/lib/thrid/c3p0-0.9.1.jar

Binary files differ

 Bin/lib/thrid/commons-codec-1.3.jar

Binary files differ

 Bin/lib/thrid/commons-collections-3.1.jar

Binary files differ

 Bin/lib/thrid/commons-dbcp-1.1.jar

Binary files differ

 Bin/lib/thrid/commons-discovery-0.2.jar

Binary files differ

 Bin/lib/thrid/commons-fileupload-1.2.2.jar

Binary files differ

 Bin/lib/thrid/commons-httpclient-3.0.jar

Binary files differ

 Bin/lib/thrid/commons-io-2.0.1.jar

Binary files differ

 Bin/lib/thrid/commons-logging-1.0.4.jar

Binary files differ

 Bin/lib/thrid/commons-net-1.4.1.jar

Binary files differ

 Bin/lib/thrid/commons-pool2-2.6.2.jar

Binary files differ

 Bin/lib/thrid/geronimo-stax-api_1.0_spec-1.0.jar

Binary files differ

 Bin/lib/thrid/guava-20.0.jar

Binary files differ

 Bin/lib/thrid/hibernate-jpa-2.0-api-1.0.1.Final.jar

Binary files differ

 Bin/lib/thrid/hibernate3.jar

Binary files differ

 Bin/lib/thrid/inforbroker-core-5.1.0.jar

Binary files differ

 Bin/lib/thrid/javassist-3.12.0.GA.jar

Binary files differ

 Bin/lib/thrid/jaxen-1.1-beta-9.jar

Binary files differ

 Bin/lib/thrid/jaxrpc.jar

Binary files differ

 Bin/lib/thrid/jbpm-4.3.2.jar

Binary files differ

 Bin/lib/thrid/jcalendar-1.3.3.jar

Binary files differ

 Bin/lib/thrid/jcommon-1.0.17.jar

Binary files differ

 Bin/lib/thrid/jdom-1.0.jar

Binary files differ

 Bin/lib/thrid/jdsl.jar

Binary files differ

 Bin/lib/thrid/jedis-2.9.0.jar

Binary files differ

 Bin/lib/thrid/jee-management-1.1.jar

Binary files differ

 Bin/lib/thrid/jfreechart-1.0.14.jar

Binary files differ

 Bin/lib/thrid/jms-1.1.jar

Binary files differ

 Bin/lib/thrid/jta-1.1.jar

Binary files differ

 Bin/lib/thrid/juel-engine.jar

Binary files differ

 Bin/lib/thrid/juel-impl.jar

Binary files differ

 Bin/lib/thrid/juel.jar

Binary files differ

 Bin/lib/thrid/livetribe-jsr223.jar

Binary files differ

 Bin/lib/thrid/logkit-1.2.jar

Binary files differ

 Bin/lib/thrid/ognl-2.6.11.jar

Binary files differ

 Bin/lib/thrid/ojdbc8.jar

Binary files differ

 Bin/lib/thrid/picocontainer-1.2.jar

Binary files differ

 Bin/lib/thrid/plugin.jar

Binary files differ

 Bin/lib/thrid/poi-3.9-20121203.jar

Binary files differ

 Bin/lib/thrid/poi-ooxml-3.9-20121203.jar

Binary files differ

 Bin/lib/thrid/poi-ooxml-schemas-3.9-20121203.jar

Binary files differ

 Bin/lib/thrid/poi-scratchpad-3.9-20121203.jar

Binary files differ

 Bin/lib/thrid/portalcustom.jar

Binary files differ

 Bin/lib/thrid/proxool-0.8.3.jar

Binary files differ

 Bin/lib/thrid/quartz-all-1.8.6.jar

Binary files differ

 Bin/lib/thrid/rsyntax.jar

Binary files differ

 Bin/lib/thrid/saaj.jar

Binary files differ

 Bin/lib/thrid/sapjco.jar

Binary files differ

 Bin/lib/thrid/slf4j-api-1.7.14.jar

Binary files differ

 Bin/lib/thrid/slf4j-jdk14-1.7.14.jar

Binary files differ

 Bin/lib/thrid/xml-apis.jar

Binary files differ

 Bin/lib/thrid/xmlbeans-2.3.0.jar

Binary files differ

 Bin/lib/thrid/xmlsec-1.3.0.jar

Binary files differ

 Bin/lib/thrid/xstream-1.3.1.jar

Binary files differ

 Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java

@@ -5,11 +5,13 @@
import com.vci.client.common.providers.ServiceProvider;
import com.vci.corba.common.VCIError;
import com.vci.corba.omd.qtm.QTInfo;
import com.vci.corba.query.ObjectQueryService;
import com.vci.corba.query.ObjectQueryServicePrx;
import com.vci.frameworkcore.compatibility.SmUserQueryServiceI;
import com.vci.mw.client.InvocationUtility;
import com.vci.starter.web.annotation.Column;
import com.vci.starter.web.constant.QueryOptionConstant;
import com.vci.starter.web.constant.VciSystemVarConstants;
import com.vci.corba.query.data.BtmRefQueryOption;
import com.vci.starter.web.enumpck.BooleanEnum;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.DataGrid;
@@ -21,11 +23,10 @@
import com.vci.web.pageModel.*;
import com.vci.web.properties.WebProperties;
import com.vci.web.service.*;
import com.vci.web.util.Func;
import com.vci.web.util.PlatformClientUtil;
import com.vci.web.util.WebUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.tools.ant.taskdefs.condition.Os;
import org.apache.poi.ss.formula.functions.T;
import org.dom4j.DocumentException;
import org.dom4j.DocumentHelper;
import org.omg.CORBA.IntHolder;
@@ -37,10 +38,7 @@
import plm.bs.bom.clientobject.ClientBusinessObject;
import plm.bs.bom.clientobject.ClientLinkObject;
import plm.bs.bom.common.*;
import plm.corba.qt.BtmRefQueryOption;
import plm.corba.qt.KV;
import plm.corba.qt.QTServiceOperations;
import plm.corba.qt.QTWrapper;
import plm.oq.objectQuery.common.*;

import java.lang.reflect.Field;
@@ -568,7 +566,7 @@
            clauseList.add("*");
        }
        setRightValueToQueryTemplate(qt,conditionMap);//设置密级查询，和数据权限控制
        List<BtmRefQueryOption> refOpts = new ArrayList<BtmRefQueryOption>();
        List<com.vci.corba.query.data.BtmRefQueryOption> refOpts = new ArrayList<BtmRefQueryOption>();
        List<String> enumAttrName = new ArrayList<String>();
        List<String> thisQueryAttr = new ArrayList<String>();
        if(clauseList!=null && clauseList.size()>0){
@@ -614,35 +612,59 @@

        //设置分页信息和排序
        setPageAndOrderToQT(qt,ph);
        try {
            QTServiceOperations qtService = platformClientUtil.getQueryService();
        //try {
            //QTServiceOperations qtService = platformClientUtil.getQueryService();
            ObjectQueryServicePrx qtService = ServiceProvider.getOQService();
            if(qtService == null){
                logger.error("没有找到查询服务");
                throw new VciBaseException(msgCodePrefix+"qtServerNull", new String[]{});
            }
            IntHolder count = new IntHolder();
            BusinessObject[] bos = null;
            ObjectQueryService.FindBTMObjectsV3Result bos = null;
            String invo = JSONObject.toJSONString(InvocationUtility.getInvocation());
            try{
                bos = qtService.findBTMObjectsV4(invo,qt.getId(), Tool.qtTOXMl(qt).asXML(),count,refOpts.toArray(new BtmRefQueryOption[0]));
                String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
                        "<Data>\n" +
                        "    <QueryTemplate id=\"querySubFolder\" type=\"btm\">\n" +
                        "        <clauseList>querycondition,sequence,folderoid,folderbusinesstype,secretgrade,workcontextoid,checkoutby,revisionrule,hisattrvallist,isfirstv,lastmodifier,description,newattrvallist,oid,revisionid,revisionvalue,isfirstr,id,checkouttime,copyfromversion,owner,creator,checkintime,revisionseq,versionrule,versionvalue,versionseq,checkinby,lcstatus,createtime,lastmodifytime,lctid,name,islastr,nameoid,islastv,btmname,ts</clauseList>\n" +
                        "        <linkType></linkType>\n" +
                        "        <btmType>folder</btmType>\n" +
                        "        <queryChildrenFlag>false</queryChildrenFlag>\n" +
                        "        <queryISLeaf>false</queryISLeaf>\n" +
                        "        <rightFlag>false</rightFlag>\n" +
                        "        <secretFlag>true</secretFlag>\n" +
                        "        <version>0</version>\n" +
                        "        <levelRec>-1</levelRec>\n" +
                        "        <recReturnMode>1</recReturnMode>\n" +
                        "        <orderInfos>\n" +
                        "            <orderInfo>\n" +
                        "                <orderField>sequence</orderField>\n" +
                        "                <orderMode>ASC</orderMode>\n" +
                        "                <level>1</level>\n" +
                        "            </orderInfo>\n" +
                        "        </orderInfos>\n" +
                        "    </QueryTemplate>\n" +
                        "</Data>";
                //bos = qtService.findBTMObjectsV3(invo,qt.getId(), Tool.qtTOXMl(qt).asXML(),count,refOpts.toArray(new BtmRefQueryOption[0]));
                bos = qtService.findBTMObjectsV3(qt.getId(), Tool.qtTOXMl(qt).asXML(), refOpts.toArray(new BtmRefQueryOption[0]));
            }catch (VCIError e){
                bos = qtService.findBTMObjectsV4(invo,qt.getId(), Tool.qtTOXMl(qt).asXML(),count,refOpts.toArray(new BtmRefQueryOption[0]));
                //bos = qtService.findBTMObjectsV4(invo,qt.getId(), Tool.qtTOXMl(qt).asXML(),count,refOpts.toArray(new BtmRefQueryOption[0]));
            }

            if (bos != null && bos.length > 0) {
                for (BusinessObject bo : bos) {
            if (bos != null && bos.count > 0) {
                for (com.vci.corba.omd.data.BusinessObject bo : bos.returnValue) {
                    ClientBusinessObject cbo = new ClientBusinessObject();
                    cbo.setBusinessObject(bo);
                    queryEnumText(cbo,enumAttrName);
                    //cbo.setBusinessObject(bo);
                    //queryEnumText(cbo,enumAttrName);
                    allCbos.add(cbo);
                }
                //因为修改了查询的方式，所以就不需要单独查询参照
            }
            queryLcStatus(allCbos);
        } catch (VCIError e) {
        // logger.error(e.error_code,e);
        // hrow WebUtil.getVciBaseException(e);
        }
            //queryLcStatus(allCbos);
        //} //catch (VCIError e) {
//            // logger.error(e.error_code,e);
//            // hrow WebUtil.getVciBaseException(e);
//        }
        return allCbos;
    }