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

@@ -6,14 +6,10 @@
import com.vci.starter.web.util.ApplicationContextProvider;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
import com.vci.web.model.OsLifeCycleDO;
import com.vci.web.other.OsMapToObjFunction;
import com.vci.web.pageModel.OsLifeCycleVO;
import com.vci.web.util.WebUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.util.CollectionUtils;
import plm.bs.bom.clientobject.ClientBusinessObject;

import java.util.ArrayList;
import java.util.HashMap;
@@ -72,7 +68,7 @@
        String sql = (StringUtils.isNotBlank(pageSql)?" select oid,ts,creator,createTime,modifier,modifyTime,name,label,description  from (select A.* , rownum RN from (":"")
                + baseSql+ pageSql ;
        WebBoServiceI boService = ApplicationContextProvider.getApplicationContext().getBean(WebBoServiceI.class);
        List<ClientBusinessObject> dataMap = boService.queryBySql(sql, null);
        List<com.vci.client.bof.ClientBusinessObject> dataMap = boService.queryBySql(sql, null);
        DataGrid<T> dataGrid = new DataGrid<>();
        if(!CollectionUtils.isEmpty(dataMap)){
            List<T> dataList = new ArrayList<>();