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

@@ -1,7 +1,9 @@
package com.vci.web.service.impl;

import com.vci.client.common.providers.ServiceProvider;
import com.vci.corba.common.PLException;
import com.vci.corba.common.VCIError;
import com.vci.corba.omd.atm.AttributeDef;
import com.vci.starter.web.annotation.log.VciUnLog;
import com.vci.starter.web.enumpck.VciFieldTypeEnum;
import com.vci.starter.web.pagemodel.BaseQueryObject;
@@ -116,8 +118,9 @@
      //后面两个分页数，完全没有用
      try {
//         return attributeDO2VOs(Arrays.stream(platformClientUtil.getAttributeService().getAttribItems(abFilter,1,1)).collect(Collectors.toList()));
         return attributeDO2VOs(Arrays.stream(ServiceProvider.getOMDService().getAttributeService().getAttribItems(abFilter.name,1,1)).collect(Collectors.toList()));
      } catch (VCIError vciError) {
//         return attributeDO2VOs(Arrays.stream(ServiceProvider.getOMDService().getAttributeService().getAttribItems(abFilter.name,1,1)).collect(Collectors.toList()));
         return attributeDO2VOs(Arrays.stream(ServiceProvider.getOMDService().getAttributeService().getAttributeDefs(abFilter.name,1,1)).collect(Collectors.toList()));
      } catch (PLException vciError) {
         throw WebUtil.getVciBaseException(vciError);
      }
   }
@@ -141,7 +144,7 @@
    * @return 显示对象
    */
   @Override
   public List<OsAttributeVO> attributeDO2VOs(Collection<com.vci.corba.omd.atm.AttribItem> attribItems) {
   public List<OsAttributeVO> attributeDO2VOs(Collection<AttributeDef> attribItems) {
      List<OsAttributeVO> vos = new ArrayList<>();
      Optional.ofNullable(attribItems).orElseGet(()->new ArrayList<>()).stream().forEach(attribItem -> {
         vos.add(attributeDO2VO(attribItem));
@@ -156,7 +159,7 @@
    * @return 显示对象
    */
   @Override
   public OsAttributeVO attributeDO2VO(com.vci.corba.omd.atm.AttribItem attribItem) {
   public OsAttributeVO attributeDO2VO(AttributeDef attribItem) {
      OsAttributeVO attributeVO = new OsAttributeVO();
      if(attribItem!=null){
         attributeVO.setOid(attribItem.oid);