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

@@ -556,14 +556,14 @@
    * @return 查询出来的值
    * @throws VciBaseException 查询出错的时候会抛出异常
    */
   private List<com.vci.client.bof.ClientBusinessObject> baseQueryCBO(QueryTemplate qt,Map<String,String> conditionMap,PageHelper ph,List<String> clauseList) throws VciBaseException{
   private List<ClientBusinessObject> baseQueryCBO(QueryTemplate qt,Map<String,String> conditionMap,PageHelper ph,List<String> clauseList) throws VciBaseException{
      List<com.vci.client.bof.ClientBusinessObject> allCbos = new ArrayList<com.vci.client.bof.ClientBusinessObject>();
      if(clauseList == null){
         clauseList = new ArrayList<String>();
         clauseList.add("*");
      }
      setRightValueToQueryTemplate(qt,conditionMap);//设置密级查询，和数据权限控制
      List<com.vci.corba.query.data.BtmRefQueryOption> refOpts = new ArrayList<BtmRefQueryOption>();
      List<BtmRefQueryOption> refOpts = new ArrayList<BtmRefQueryOption>();
      List<String> enumAttrName = new ArrayList<String>();
      List<String> thisQueryAttr = new ArrayList<String>();
      if(clauseList!=null && clauseList.size()>0){
@@ -610,25 +610,15 @@
      //设置分页信息和排序
      setPageAndOrderToQT(qt,ph);
      try {
         // QTServiceOperations qtService = platformClientUtil.getQueryService();
         ObjectQueryServicePrx qtService = ServiceProvider.getOQService();
         ObjectQueryServicePrx qtService = platformClientUtil.getQueryService();
         if(qtService == null){
            logger.error("没有找到查询服务");
            throw new VciBaseException(msgCodePrefix+"qtServerNull", new String[]{});
         }
//         IntHolder count = new IntHolder();
         ObjectQueryService.FindBTMObjectsV3Result bos = null;
//         String invo = JSONObject.toJSONString(InvocationUtility.getInvocation());
         try{
            //bos = qtService.findBTMObjectsV3(invo,qt.getId(), OQTool.qtTOXMl(qt).asXML(),count,refOpts.toArray(new BtmRefQueryOption[0]));
            bos = qtService.findBTMObjectsV3(qt.getId(), OQTool.qtTOXMl(qt).asXML(), refOpts.toArray(new BtmRefQueryOption[0]));
         }catch (PLException e){
            //bos = qtService.findBTMObjectsV4(invo,qt.getId(), OQTool.qtTOXMl(qt).asXML(),count,refOpts.toArray(new BtmRefQueryOption[0]));
            bos = qtService.findBTMObjectsV3(qt.getId(), OQTool.qtTOXMl(qt).asXML(), refOpts.toArray(new BtmRefQueryOption[0]));
         }
         ObjectQueryService.FindBTMObjectsV3Result bos = qtService.findBTMObjectsV3(qt.getId(), OQTool.qtTOXMl(qt).asXML(), refOpts.toArray(new BtmRefQueryOption[refOpts.size()]));
         if (bos != null && bos.count > 0) {
            for (com.vci.corba.omd.data.BusinessObject bo : bos.returnValue) {
               com.vci.client.bof.ClientBusinessObject cbo = new com.vci.client.bof.ClientBusinessObject();
            for (BusinessObject bo : bos.returnValue) {
               ClientBusinessObject cbo = new ClientBusinessObject();
               cbo.setBusinessObject(bo);
               queryEnumText(cbo,enumAttrName);
               allCbos.add(cbo);