PLTWEB.git - Gitblit

			@@ -1,53 +1,51 @@
			package com.vci.web.service.impl;

			import com.alibaba.fastjson.JSONObject;
			import com.alibaba.fastjson.JSON;
			import com.vci.common.utility.ObjectUtility;
			import com.vci.corba.common.PLException;
			import com.vci.corba.common.data.UserEntityInfo;
			import com.vci.corba.framework.data.RoleRightInfo;
			import com.vci.corba.omd.btm.BizType;
			import com.vci.corba.omd.ltm.LinkType;
			import com.vci.corba.omd.qtm.QTInfo;
			import com.vci.corba.portal.PortalService;
			import com.vci.corba.portal.data.*;
			import com.vci.dto.RoleRightDTO;
			import com.vci.dto.UIAuthorDTO;
			import com.vci.model.PLDefination;
			import com.vci.pagemodel.*;
			import com.vci.starter.poi.bo.WriteExcelData;
			import com.vci.starter.poi.bo.WriteExcelOption;
			import com.vci.starter.poi.bo.*;
			import com.vci.starter.poi.util.ExcelUtil;
			import com.vci.starter.web.exception.VciBaseException;
			import com.vci.starter.web.pagemodel.*;
			import com.vci.starter.web.pagemodel.BaseQueryObject;
			import com.vci.starter.web.pagemodel.BaseResult;
			import com.vci.starter.web.pagemodel.DataGrid;
			import com.vci.starter.web.pagemodel.SessionInfo;
			import com.vci.starter.web.redis.RedisService;
			import com.vci.starter.web.util.*;
			import com.vci.starter.web.util.Lcm.BeanUtil;
			import com.vci.starter.web.util.Lcm.CollectionUtil;
			import com.vci.starter.web.util.Lcm.Func;
			import com.vci.web.service.OsBtmServiceI;
			import com.vci.web.service.UIManagerServiceI;
			import com.vci.web.util.*;
			import com.vci.web.util.BeanUtil;
			import org.apache.commons.lang3.StringUtils;
			import com.vci.web.util.Func;
			import com.vci.web.util.PlatformClientUtil;
			import com.vci.web.util.RightControlUtil;
			import com.vci.web.util.UITools;
			import com.vci.web.utility.UIDataFetcher;
			import lombok.AllArgsConstructor;
			import lombok.NoArgsConstructor;
			import org.apache.commons.lang3.StringUtils;
			import org.slf4j.Logger;
			import org.slf4j.LoggerFactory;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;
			import org.springframework.web.multipart.MultipartFile;

			import javax.annotation.Resource;
			import java.io.File;
			import java.util.*;
			import java.util.concurrent.atomic.AtomicBoolean;
			import java.util.concurrent.TimeUnit;
			import java.util.concurrent.atomic.AtomicInteger;
			import java.util.stream.Collectors;
			import java.util.regex.Pattern;
			import java.util.stream.Collectors;

			/**
			* UI定义服务界面相关接口
			* UI定义管理服务界面相关接口
			* @author ludc
			* @date 2024/8/28 17:05
			*/
			@@ -61,10 +59,11 @@
			private PlatformClientUtil platformClientUtil;

			/**
			* 角色
			* 缓存工具
			*/
			@Resource
			private SmRoleQueryServiceI smRoleQueryServiceI;
			private RedisService redisService;

			/***
			* 是否是管理员
			*/
			@@ -83,22 +82,22 @@
			private Logger logger = LoggerFactory.getLogger(getClass());

			/**
			* 导入数据的sheet集合
			*/
			private final String IMPORTUIKEY = "importUIKey:";

			/**
			* ui定义数据引擎
			*/
			private UIDataFetcher uiDataFetcher = null;

			/**
			* 排序比较器
			*/
			private Comparator<PLUILayout> pageLayoutComparator = new Comparator<PLUILayout>() {
			@Override
			public int compare(PLUILayout o1, PLUILayout o2) {
			return o1.plCode.compareTo(o2.plCode);
			}
			};

			/**
			* 排序比较器
			*/
			private Comparator<PLDefinationVO> pageDefinationComparator = new Comparator<PLDefinationVO>() {
			@Override
			public int compare(PLDefinationVO o1, PLDefinationVO o2) {
			return new Integer(o1.getSeq()).compareTo(new Integer(o2.getSeq()));
			}
			};

			@@ -135,7 +134,7 @@
			}

			/**
			* ton通过业务类型和名称查询
			* 通过业务类型和名称查询
			* @param btemName
			* @param context
			* @return
			@@ -151,7 +150,7 @@
			contextList.add("");
			}
			contextList.stream().forEach(code->{
			PLUILayout[] pluiLayouts= new PLUILayout[0];
			PLUILayout[] pluiLayouts= new PLUILayout[0];
			try {
			pluiLayouts = platformClientUtil.getUIService().getPLUILayoutEntityByTypeAndCode(btemName,code);
			} catch (PLException e) {
			@@ -431,14 +430,17 @@
			//区域定义
			tpDataList.add(new WriteExcelData(tpRow.get(),0, tabPage.plOId));
			tpDataList.add(new WriteExcelData(tpRow.get(),1, tabPage.plSeq));
			tpDataList.add(new WriteExcelData(tpRow.get(),2, tabPage.plLabel));
			tpDataList.add(new WriteExcelData(tpRow.get(),3, tabPage.plName));
			tpDataList.add(new WriteExcelData(tpRow.get(),4, tabPage.plContextOId));
			tpDataList.add(new WriteExcelData(tpRow.get(),5, tabPage.plIsOpen));
			tpDataList.add(new WriteExcelData(tpRow.get(),6, tabPage.plOpenExpression));
			tpDataList.add(new WriteExcelData(tpRow.get(),7, tabPage.plUIParser));
			tpDataList.add(new WriteExcelData(tpRow.get(),8, tabPage.plExtAttr));
			tpDataList.add(new WriteExcelData(tpRow.get(),9, tabPage.plDesc));
			tpDataList.add(new WriteExcelData(tpRow.get(),2, tabPage.plCode));
			tpDataList.add(new WriteExcelData(tpRow.get(),3, tabPage.plLabel));
			tpDataList.add(new WriteExcelData(tpRow.get(),4, tabPage.plName));
			tpDataList.add(new WriteExcelData(tpRow.get(),5, tabPage.plContextOId));
			tpDataList.add(new WriteExcelData(tpRow.get(),6, tabPage.plAreaType));
			tpDataList.add(new WriteExcelData(tpRow.get(),7, tabPage.plIsOpen));
			tpDataList.add(new WriteExcelData(tpRow.get(),8, tabPage.plOpenExpression));
			tpDataList.add(new WriteExcelData(tpRow.get(),9, tabPage.plUIParser));
			tpDataList.add(new WriteExcelData(tpRow.get(),10, tabPage.plExtAttr));
			tpDataList.add(new WriteExcelData(tpRow.get(),11, tabPage.plDesc));
			tpDataList.add(new WriteExcelData(tpRow.get(),12, tabPage.plLicensOrs));
			tpRow.getAndIncrement();
			try {
			PLPageDefination[] plPageDefinations = platformClientUtil.getUIService().getPLPageDefinationsByPageContextOId(tabPage.plOId);
			@@ -509,27 +511,349 @@
			/**
			* 导入UI上下文
			* @param file
			* @param isCovered 是否覆盖
			* @param selectBtm 选择的业务类型
			* @return
			*/
			@Override
			public BaseResult impUIContextData(MultipartFile file) {
			public BaseResult impUIContextData(File file,boolean isCovered,String selectBtm) {
			if(!isCovered){
			VciBaseUtil.alertNotNull(file,"excel文件");
			if(!file.exists()){
			throw new VciBaseException("导入的excel文件不存在,{0}",new String[]{file.getPath()});
			}
			}

			try {
			List<SheetDataSet> sheetDataSets = null;
			SessionInfo sessionInfo = WebThreadLocalUtil.getCurrentUserSessionInfoInThread();
			//是覆盖操作，所以直接读取
			if(isCovered){
			sheetDataSets = redisService.getCacheList(IMPORTUIKEY + sessionInfo.getUserId());
			if(Func.isEmpty(sheetDataSets)){
			throw new VciBaseException("从缓存中未获取到导入的数据，请刷新后重试！！");
			}
			}else{
			//读取excel表
			ReadExcelOption readExcelOption = new ReadExcelOption();
			readExcelOption.setReadAllSheet(true); //读取全部的sheet
			sheetDataSets = ExcelUtil.readDataObjectFromExcel(file,SheetDataSet.class,readExcelOption);
			}

			PLUILayout[] plpagelayoutdefinations = null;

			SheetDataSet plpagelayoutdefnationsheet = sheetDataSets.get(0);
			SheetDataSet pltabpagesheet = sheetDataSets.get(1);
			SheetDataSet plpagedefinationsheet = sheetDataSets.get(2);
			SheetDataSet pltabbuttonsheet = sheetDataSets.get(3);
			SheetDataSet plcommondparamsheet = sheetDataSets.get(4);

			return null;
			Map<PLUILayout,List<PLTabPage>> pdMap = new HashMap<>();
			Map<PLTabPage,List<PLPageDefination>> tdMap = new HashMap<>();
			Map<PLPageDefination,List<PLTabButton>> dbMap = new HashMap<>();
			Map<PLTabButton,List<PLCommandParameter>> bcMap = new HashMap<>();

			List<PLUILayout> plpagelayoutdefinationList = new ArrayList<>();
			List<PLTabPage> pltabpagelist = new ArrayList<>();
			List<PLPageDefination> plpagedefinationlist = new ArrayList<>();
			List<PLTabButton> pltabbuttonlist = new ArrayList<>();
			List<PLCommandParameter> plcommandparameterlist = new ArrayList<>();

			/*StringBuffer checkplpagelayoutdefination = new StringBuffer();
			StringBuffer checkplpagelayoutdefinationPlcode = new StringBuffer();*/
			StringBuffer plActionIDNulls = new StringBuffer();

			//add by caill start 初始化标记
			int count=0;
			int preCount=0;
			String preOID="";
			String doublePreOID="";
			String plpageLayoutDefinationId="";
			String plPageContextOId="";
			String plCommandOId="";
			String plTableOId="";

			//add by caill end
			PLAction[] allPLAction = platformClientUtil.getUIService().getAllPLAction();
			Map<String,String> relation = null;
			List<SheetRowData> rowData = plpagelayoutdefnationsheet.getRowData();
			for(int i=0; i<rowData.size(); i++){
			pltabpagelist = new ArrayList<PLTabPage>();
			PLUILayout p = new PLUILayout();
			//HSSFRow readrow = plpagelayoutdefnationsheet.getRowData();
			Map<Integer, String> dataMap = rowData.get(i).getData();
			if(Func.isEmpty(dataMap)){
			break;
			}
			//根据业务类型查询ui上下文
			plpagelayoutdefinations = platformClientUtil.getUIService().getPLUILayoutsByRelatedType(selectBtm);

			p.plOId = ObjectUtility.getNewObjectID36();
			p.plCode = dataMap.get(1);
			p.plName = dataMap.get(2);
			//add by caill start
			//遍历UI名称
			for(PLUILayout pd : plpagelayoutdefinations){
			if(pd.plName.equals(p.plName) && !isCovered){
			//如果用户选择覆盖，第二次调用就不会传导入文件，所以这里存入缓存
			redisService.setCacheList(IMPORTUIKEY+sessionInfo.getUserId(),sheetDataSets);
			//设置过期时间为5分钟，因为一般情况下不会说是等太久
			redisService.expire(IMPORTUIKEY+sessionInfo.getUserId(),5, TimeUnit.MINUTES);
			throw new VciBaseException(pd.plName+"名称已经存在,是否覆盖?");
			}
			//根据UI上下文做判断
			if(pd.plCode.equals(p.plCode)){
			count=1;
			preOID=pd.plOId; //如果UI上下文相同，就把系统中的id赋值给新导入的id
			p.plOId=pd.plOId;
			}
			}
			//add by caill end
			plpageLayoutDefinationId = dataMap.get(0);
			String name = dataMap.get(3);
			p.plRelatedType = dataMap.get(3);
			p.plIsShowNavigator = Short.parseShort(dataMap.get(4));
			p.plIsShowTab = Short.parseShort(dataMap.get(5));
			p.plIsShowForm = Short.parseShort(dataMap.get(6));
			//选择的和导入的业务类型节点不一致
			if(!selectBtm.equals(name)){
			throw new VciBaseException("请选择要导入的类型节点名称！");
			}

			plpagelayoutdefinationList.add(p);

			//区域定义sheet处理
			List<SheetRowData> tabPageRowData = pltabpagesheet.getRowData();
			if(Func.isNotEmpty(tabPageRowData)){
			for(int j=0; j<tabPageRowData.size(); j++){
			plpagedefinationlist = new ArrayList<PLPageDefination>();
			PLTabPage pt = new PLTabPage();
			Map<Integer, String> tabPageDataMap = tabPageRowData.get(j).getData();
			if(Func.isEmpty(tabPageDataMap)){
			break;
			}
			pt.plOId = ObjectUtility.getNewObjectID36();
			pt.plCode = tabPageDataMap.get(2);
			pt.plName = tabPageDataMap.get(4);
			//add by caill start
			if(count==1) {
			PLTabPage[] PLTabPages = platformClientUtil.getUIService().getPLTabPagesByPageDefinationOId(preOID);
			//遍历控制区表格
			for(PLTabPage pl : PLTabPages){
			if(pl.plCode.equals(pt.plCode)){
			pt.plOId=pl.plOId; //如果控制区表格的编码和导入的编码一样，就把控制区id赋值给新导入的id
			preCount=1;
			doublePreOID=pl.plOId;
			}
			}
			}
			//add by caill end
			pt.plSeq = Short.parseShort(tabPageDataMap.get(1));
			pt.plLabel = tabPageDataMap.get(3);
			pt.plContextOId = tabPageDataMap.get(5);
			pt.plAreaType = Short.parseShort(tabPageDataMap.get(6));
			pt.plIsOpen = Short.parseShort(tabPageDataMap.get(7));
			pt.plOpenExpression = tabPageDataMap.get(8);
			pt.plUIParser = tabPageDataMap.get(9);
			pt.plExtAttr = tabPageDataMap.get(10);
			pt.plDesc = tabPageDataMap.get(11);
			pt.plLicensOrs = tabPageDataMap.get(12);
			plPageContextOId = tabPageDataMap.get(5);
			if(pt.plContextOId.equals(plpageLayoutDefinationId)){
			pt.plContextOId = p.plOId;
			pltabpagelist.add(pt);
			//页面设计处理
			List<SheetRowData> pagedefinationRowData = plpagedefinationsheet.getRowData();
			if(Func.isNotEmpty(pagedefinationRowData)){
			for(int k=0;k<pagedefinationRowData.size();k++){
			pltabbuttonlist = new ArrayList<>();
			PLPageDefination plpagedefination = new PLPageDefination();
			Map<Integer, String> pagedefinationDataMap = pagedefinationRowData.get(k).getData();

			if(Func.isEmpty(pagedefinationDataMap)){
			break;
			}
			plpagedefination.plOId = ObjectUtility.getNewObjectID36();
			plpagedefination.name = pagedefinationDataMap.get(3);
			//add by caill start
			//最后一级的判断
			if(preCount==1) {
			PLPageDefination[] PLPageDefinations = platformClientUtil.getUIService().getPLPageDefinationsByPageContextOId(doublePreOID);
			for(PLPageDefination plp : PLPageDefinations) {
			if(plp.name.equals(plpagedefination.name)) {
			plpagedefination.plOId=plp.plOId;

			}

			}
			}
			//add by caill end
			plpagedefination.plDefination = pagedefinationDataMap.get(6);
			plpagedefination.seq = Short.parseShort(pagedefinationDataMap.get(5));
			plpagedefination.plTabPageOId = pagedefinationDataMap.get(1);
			plpagedefination.desc = pagedefinationDataMap.get(4);
			plpagedefination.plType = Short.parseShort(pagedefinationDataMap.get(2));
			plTableOId = pagedefinationDataMap.get(1);
			if(plpagedefination.plTabPageOId.equals(plPageContextOId)){
			plpagedefination.plTabPageOId = pt.plOId;
			plpagedefinationlist.add(plpagedefination);
			//保存新旧oid的关系，在确定层级关系时使用
			relation = new HashMap<String,String>();
			List<SheetRowData> tabbuttonRowData = pltabbuttonsheet.getRowData();
			if(Func.isNotEmpty(tabbuttonRowData)){
			for(int a=0;a<tabbuttonRowData.size();a++){
			Map<Integer, String> tabbuttonDataMap = tabbuttonRowData.get(a).getData();
			if(Func.isNotEmpty(tabbuttonDataMap)){
			plCommandOId = tabbuttonDataMap.get(1);
			String newOId = ObjectUtility.getNewObjectID36();
			relation.put(plCommandOId, newOId);
			}
			}
			for(int a=0;a<tabbuttonRowData.size();a++){
			plcommandparameterlist = new ArrayList<PLCommandParameter>();
			PLTabButton plTabButton = new PLTabButton();
			Map<Integer, String> tabbuttonDataMap = tabbuttonRowData.get(a).getData();
			if(Func.isEmpty(tabbuttonDataMap)){
			break;
			}
			plTabButton.plOId = ObjectUtility.getNewObjectID36();
			plTabButton.plLabel = tabbuttonDataMap.get(4);
			plTabButton.plAreaType = tabbuttonDataMap.get(5);
			plTabButton.plTableOId = tabbuttonDataMap.get(1);
			plTabButton.plSeq = Short.parseShort(tabbuttonDataMap.get(7));
			String plActionId = "";
			//PLAction[] allPLAction = Tool.getService().getAllPLAction();
			for(PLAction action : allPLAction){
			if((tabbuttonDataMap.get(3)!=null&&!"".equals(tabbuttonDataMap.get(3))
			)&&(tabbuttonDataMap.get(3).trim().equals(action.plCode.trim()))
			){
			plActionId = action.plOId;
			break;
			}
			}
			if(plActionId==null\|\|"".equals(plActionId)){
			if(!plActionIDNulls.toString().contains(tabbuttonDataMap.get(3))){
			plActionIDNulls.append("\n\tAction编号:"+tabbuttonDataMap.get(3));
			}
			}
			plTabButton.plActionOId = plActionId;
			plTabButton.plAreaType = tabbuttonDataMap.get(5);
			plTabButton.plDesc = tabbuttonDataMap.get(6);
			String parentOid = tabbuttonDataMap.get(8);//父oid
			plCommandOId = tabbuttonDataMap.get(1);
			plTabButton.displayMode = tabbuttonDataMap.get(9);
			plTabButton.iconPath = tabbuttonDataMap.get(10);
			plTabButton.authorization = tabbuttonDataMap.get(11);
			plTabButton.show = tabbuttonDataMap.get(12);

			//赋予保存好的值，来保证层级关系不会丢失
			plTabButton.plOId = relation.get(plCommandOId);
			if(parentOid != null && parentOid.length() > 0) {
			plTabButton.plParentOid =
			relation.get(parentOid) == null ? "" : relation.get(parentOid);
			}
			if(plTabButton.plTableOId.equals(plTableOId)){
			plTabButton.plTableOId = plpagedefination.plOId;
			pltabbuttonlist.add(plTabButton);
			List<SheetRowData> commondparamsRowData = plcommondparamsheet.getRowData();
			if(Func.isNotEmpty(commondparamsRowData)){
			for(int b=0;b<commondparamsRowData.size();b++){
			PLCommandParameter plCommandParameter = new PLCommandParameter();
			Map<Integer, String> commandParameterDataMap = commondparamsRowData.get(b).getData();
			if(Func.isEmpty(commandParameterDataMap)){
			break;
			}
			plCommandParameter.plOId = ObjectUtility.getNewObjectID36();
			plCommandParameter.plCommandOId = commandParameterDataMap.get(1);
			plCommandParameter.plKey = commandParameterDataMap.get(2);
			plCommandParameter.plValue = commandParameterDataMap.get(3);
			if(plCommandParameter.plCommandOId.equals(plCommandOId)){
			plCommandParameter.plCommandOId = plTabButton.plOId;
			plcommandparameterlist.add(plCommandParameter);
			}
			}
			bcMap.put(plTabButton, plcommandparameterlist);
			}
			}
			}
			dbMap.put(plpagedefination, pltabbuttonlist);
			}
			}
			}
			tdMap.put(pt, plpagedefinationlist);
			}
			}
			}
			pdMap.put(p, pltabpagelist);
			}
			}

			if(plActionIDNulls.length()>0){
			throw new VciBaseException(plActionIDNulls.toString()+"不存在！");
			}

			//删除原有button数据
			if(tdMap.size() > 0) {
			for(List<PLPageDefination> list : tdMap.values()) {
			for(PLPageDefination ppd : list) {
			if(ppd.plOId != null && ppd.plOId.length() > 0) {
			PLTabButton[] buttons = platformClientUtil.getUIService().getPLTabButtonsByTableOId(ppd.plOId);
			if(buttons != null && buttons.length > 0) {
			for(PLTabButton ptb : buttons) {
			platformClientUtil.getUIService().deletePLTabButtonByID(ptb.plOId);
			}
			}
			}
			}
			}
			}

			for(PLUILayout plPageLayoutDefination : plpagelayoutdefinationList){
			List<PLTabPage> pltabpagelists = pdMap.get(plPageLayoutDefination);
			for(PLTabPage pltabpage:pltabpagelists){
			List<PLPageDefination> plpagedefinationlists = tdMap.get(pltabpage);
			for(PLPageDefination plpagedefination : plpagedefinationlists){
			List<PLTabButton> pltabbuttons = dbMap.get(plpagedefination);
			for(PLTabButton pltabbutton : pltabbuttons){
			List<PLCommandParameter> plcommandParams = bcMap.get(pltabbutton);
			for(PLCommandParameter plcommandparameter : plcommandParams){
			plcommandparameter.plCreateUser = sessionInfo.getUserId();
			plcommandparameter.plModifyUser = sessionInfo.getUserId();
			platformClientUtil.getUIService().savePLCommandParameter(plcommandparameter);
			}
			pltabbutton.plCreateUser = sessionInfo.getUserId();
			pltabbutton.plModifyUser = sessionInfo.getUserId();
			platformClientUtil.getUIService().savePLTabButton(pltabbutton);
			}
			platformClientUtil.getUIService().savePLPageDefination(plpagedefination);
			}
			pltabpage.plCreateUser = sessionInfo.getUserId();
			pltabpage.plModifyUser = sessionInfo.getUserId();
			platformClientUtil.getUIService().savePLTabPage(pltabpage);
			}
			plPageLayoutDefination.plCreateUser = sessionInfo.getUserId();
			plPageLayoutDefination.plModifyUser = sessionInfo.getUserId();
			platformClientUtil.getUIService().savePLUILayout(plPageLayoutDefination);
			}
			return BaseResult.success("UI上下文导入成功！");
			} catch (PLException e) {
			e.printStackTrace();
			return BaseResult.success("UI上下文导入失败,原因："+VciBaseUtil.getExceptionMessage(e));
			}
			}

			/**
			* 根据上下文ID和区域类型，按顺序获取当前区域的tab页
			* 根据上下文ID和区域（页签）类型，按顺序获取当前区域的tab页
			*/
			@Override
			public DataGrid getTabByContextIdAndType(String contextId, int areaType) throws PLException {
			VciBaseUtil.alertNotNull(contextId,"上下文主键",areaType,"区域类型");
			PLTabPage[] plTabPages = platformClientUtil.getUIService().getTabPagesByContextIdAndType(contextId, (short) areaType);
			List<PLTabPage> tabPageList = Arrays.stream(plTabPages).sorted(((o1, o2) -> Math.toIntExact(o1.plSeq - o2.plSeq)))
			.collect(Collectors.toList());
			DataGrid dataGrid = new DataGrid();
			dataGrid.setTotal(plTabPages.length);
			dataGrid.setData(Arrays.asList(plTabPages));
			dataGrid.setData(tabPageList);
			return dataGrid;
			}

			@@ -552,7 +876,7 @@
			}

			/**
			* 修改区域数据
			* 修改区域（页签）数据
			* @param plTabPage
			* @return
			*/
			@@ -569,7 +893,7 @@
			}

			/**
			* 删除区域数据
			* 删除区域（页签）数据
			* @param oids
			* @return
			*/
			@@ -722,9 +1046,9 @@
			pdVO.getShowType(),
			pdVO.getLinkType(),
			pdVO.getQueryTemplateName(),
			pdVO.getShowExpressionRoot(),
			pdVO.getShowExpression(),
			pdVO.getRefTreeSet(),
			pdVO.getRootContent(),
			pdVO.getShowAbs(),
			pdVO.getShowLinkAbs(),
			pdVO.getSeparator(),
			pdVO.getExpandMode()
			);
			@@ -737,8 +1061,8 @@
			case "6":
			UILayoutComptCheckInput ulci = new UILayoutComptCheckInput(
			pdVO.getSearchTarger(),
			pdVO.getShowType(),
			pdVO.getUiLayout(),
			pdVO.getSubUIObjType(),
			pdVO.getSubUILayout(),
			pdVO.getQueryTemplateName(),
			pdVO.getQryType()
			);
			@@ -749,6 +1073,7 @@
			break;
			}

			d.setNavigatorType(pdVO.getNavigatorType());
			d = setEventDataToPLDefination(d,pdVO);
			//转xml赋值到plDefination中
			pd.plDefination = UITools.getPLDefinationText(d);
			@@ -839,9 +1164,9 @@
			pdVO.getShowType(),
			pdVO.getLinkType(),
			pdVO.getQueryTemplateName(),
			pdVO.getShowExpressionRoot(),
			pdVO.getShowExpression(),
			pdVO.getRefTreeSet(),
			pdVO.getRootContent(),
			pdVO.getShowAbs(),
			pdVO.getShowLinkAbs(),
			pdVO.getSeparator(),
			pdVO.getExpandMode()
			);
			@@ -854,8 +1179,8 @@
			case "6":
			UILayoutComptCheckInput ulci = new UILayoutComptCheckInput(
			pdVO.getSearchTarger(),
			pdVO.getShowType(),
			pdVO.getUiLayout(),
			pdVO.getSubUIObjType(),
			pdVO.getSubUILayout(),
			pdVO.getQueryTemplateName(),
			pdVO.getQryType()
			);
			@@ -865,7 +1190,7 @@
			d = ulci.getNewPLDefination(d);
			break;
			}

			d.setNavigatorType(pdVO.getNavigatorType());
			d = setEventDataToPLDefination(d,pdVO);
			pd.plDefination = UITools.getPLDefinationText(d);

			@@ -897,15 +1222,17 @@
			PLTabButton[] plTabButtons = platformClientUtil.getUIService().getPLTabButtonsByTableOId(pageDefinationOid);
			buttonList = Arrays.asList(plTabButtons);
			List<PLTabButtonVO> plTabButtonVOList = this.tabButton2TabButtonVOS(buttonList);
			List<PLTabButtonVO> returnButtonVOList = new ArrayList<>();
			PLTabButtonVO plTabButtonVO = new PLTabButtonVO();
			for(int i = 0; i < plTabButtonVOList.size(); i++){
			plTabButtonVO = plTabButtonVOList.get(i);

			if(plTabButtonVO.getParentOid().equals("")){
			plTabButtonVO.setChildren(plTabButtonVO2Children(plTabButtonVOList,plTabButtonVO.getOId()));
			returnButtonVOList.add(plTabButtonVO);
			}
			}
			return plTabButtonVOList;
			return returnButtonVOList;
			} catch (Exception e) {
			e.printStackTrace();
			throw new VciBaseException("加载页签区域按钮配置信息异常：" + e.getMessage());
			@@ -948,7 +1275,7 @@
			}
			plTabButtonVO.setOId(tabButtonDO.plOId);
			plTabButtonVO.setTableOId(tabButtonDO.plTableOId);
			plTabButtonVO.setPageOId(tabButtonDO.plPageOId);
			//plTabButtonVO.setPageOId(tabButtonDO.plPageOId);
			plTabButtonVO.setActionOId(tabButtonDO.plActionOId);
			plTabButtonVO.setLabel(tabButtonDO.plLabel);
			plTabButtonVO.setAreaType(tabButtonDO.plAreaType);
			@@ -976,6 +1303,10 @@
			));
			plTabButtonVO.setButtonParams(parameterMap);
			}
			if(Func.isNotBlank(tabButtonDO.plActionOId)){
			PLAction actionInfo = platformClientUtil.getUIService().getPLActionById(tabButtonDO.plActionOId);
			plTabButtonVO.setActionName(Func.isNotEmpty(actionInfo) ? actionInfo.plName:"");
			}
			return plTabButtonVO;
			}

			@@ -992,7 +1323,7 @@
			continue;
			}
			if(plTabButtonVO.getParentOid().equals(plOid)){
			plTabButtonVO.setChildren(plTabButtonVO2Children(plTabButtonVOList,plOid));
			plTabButtonVO.setChildren(plTabButtonVO2Children(plTabButtonVOList,plTabButtonVO.getOId()));
			plTabButtonVOS.add(plTabButtonVO);
			}
			}
			@@ -1008,7 +1339,7 @@
			private PLTabButton tabButtonVO2TabButton(PLTabButton plTabButton,PLTabButtonVO tabButtonVO) {
			plTabButton.plOId = tabButtonVO.getOId();
			plTabButton.plTableOId = tabButtonVO.getTableOId();
			plTabButton.plPageOId = tabButtonVO.getPageOId();
			//plTabButton.plPageOId = tabButtonVO.getPageOId();
			plTabButton.plActionOId = tabButtonVO.getActionOId();
			plTabButton.plLabel = tabButtonVO.getLabel();
			plTabButton.plAreaType = tabButtonVO.getAreaType();
			@@ -1033,8 +1364,8 @@
			* @return
			*/
			@Override
			public BaseResult addTapButton(PLTabButtonVO tabButtonVO) {
			boolean res = this.saveOrUpdateTapButton(tabButtonVO, true);
			public BaseResult addTabButton(PLTabButtonVO tabButtonVO) {
			boolean res = this.saveOrUpdateTabButton(tabButtonVO, true);
			return res ? BaseResult.success("按钮配置添加成功！"):BaseResult.success("按钮配置添加失败！");
			}

			@@ -1044,8 +1375,8 @@
			* @return
			*/
			@Override
			public BaseResult updateTapButton(PLTabButtonVO tabButtonVO) {
			boolean res = this.saveOrUpdateTapButton(tabButtonVO, false);
			public BaseResult updateTabButton(PLTabButtonVO tabButtonVO) {
			boolean res = this.saveOrUpdateTabButton(tabButtonVO, false);
			return res ? BaseResult.success("按钮配置修改成功！"):BaseResult.success("按钮配置修改失败！");
			}

			@@ -1055,11 +1386,10 @@
			* @return
			*/
			@Override
			public boolean saveOrUpdateTapButton(PLTabButtonVO tabButtonVO,boolean isAdd){
			VciBaseUtil.alertNotNull(tabButtonVO,"按钮配置对象",tabButtonVO.getLabel(),"参数名称");
			public boolean saveOrUpdateTabButton(PLTabButtonVO tabButtonVO,boolean isAdd){
			VciBaseUtil.alertNotNull(tabButtonVO,"按钮配置对象",tabButtonVO.getLabel(),"参数名称",tabButtonVO.getTableOId(),"页面定义主键");
			//检查当前添加的列表是否重复，但是这儿只支持单条数据保存，所有当前列表判重可以前端来做
			//String btnParamValidate = this.geCheckRes();

			if (tabButtonVO.getSeq() < 1 \|\| tabButtonVO.getSeq() > 63) {
			throw new VciBaseException("按序号超出范围，请修改，按钮【编号】只能在【1-63】范围内。");
			}
			@@ -1101,9 +1431,19 @@
			e.printStackTrace();
			}
			}
			this.saveButtonParams(tabButtonVO.getButtonParams(),plTabButton.plOId);
			return true;
			}

			LinkedHashMap<String, String> buttonParams = tabButtonVO.getButtonParams();
			/**
			* 按钮参数保存
			* @param buttonParams
			* @param tabButtonOid
			* @return
			*/
			private void saveButtonParams(LinkedHashMap<String, String> buttonParams,String tabButtonOid) throws VciBaseException{
			if(Func.isNotEmpty(buttonParams)) {
			SessionInfo sessionInfo = WebThreadLocalUtil.getCurrentUserSessionInfoInThread();
			Iterator<Map.Entry<String, String>> iterator = buttonParams.entrySet().iterator();
			while(iterator.hasNext()){
			Map.Entry<String, String> next = iterator.next();
			@@ -1116,7 +1456,7 @@
			Map.Entry<String, String> next = kvItor.next();
			PLCommandParameter plCommandParameter = new PLCommandParameter();
			plCommandParameter.plOId = ObjectUtility.getNewObjectID36();
			plCommandParameter.plCommandOId = plTabButton.plOId;
			plCommandParameter.plCommandOId = tabButtonOid;
			plCommandParameter.plKey = next.getKey();
			plCommandParameter.plValue = next.getValue();
			plCommandParameter.plCreateUser = sessionInfo.getUserId();
			@@ -1125,11 +1465,10 @@
			platformClientUtil.getUIService().savePLCommandParameter(plCommandParameter);
			} catch (PLException e) {
			e.printStackTrace();
			throw new VciBaseException("保存按钮信息时发生异常："+ e.getMessage());
			throw new VciBaseException("保存按钮参数时发生异常："+ e.getMessage());
			}
			}
			}
			return true;
			}

			/**
			@@ -1138,7 +1477,7 @@
			* @return
			*/
			@Override
			public boolean deleteTapButton(PLTabButtonVO tabButtonVO) throws PLException {
			public boolean deleteTabButton(PLTabButtonVO tabButtonVO) throws PLException {
			VciBaseUtil.alertNotNull(tabButtonVO,"删除的按钮配置对象");
			boolean success = platformClientUtil.getUIService().deletePLTabButton(this.tabButtonVO2TabButton(new PLTabButton(),tabButtonVO));
			if(success == false){
			@@ -1154,7 +1493,7 @@
			*/
			@Override
			public BaseResult joinBtn(PLTabButtonVO tabButtonVO) throws PLException {
			VciBaseUtil.alertNotNull(tabButtonVO,"需调整为下级按钮",tabButtonVO.getTableOId(),"当前按钮配置所在的页面主键");
			VciBaseUtil.alertNotNull(tabButtonVO,"需调整为下级按钮的对象",tabButtonVO.getTableOId(),"当前按钮配置所在的页面主键");
			//同一页面下的按钮
			List<PLTabButtonVO> plTabButtons = this.getTabButtons(tabButtonVO.getTableOId());
			if(Func.isEmpty(plTabButtons)){
			@@ -1179,7 +1518,7 @@
			if(success == false) {
			return BaseResult.fail("修改失败！");
			}
			return BaseResult.fail("修改成功！");
			return BaseResult.success("修改成功！");
			}

			/**
			@@ -1357,40 +1696,60 @@
			String type = StringUtils.isBlank(conditionMap.get("type")) ? "" : conditionMap.get("type");
			String context = StringUtils.isBlank(conditionMap.get("context")) ? "" : conditionMap.get("context");
			boolean showCheckBox = Boolean.parseBoolean(conditionMap.get("showCheckBox"));
			Map<String,RoleRightVO> roleRightVOMap=new HashMap<>();
			Map<String, List<RoleRightVO>> roleRightVOMap = new HashMap<>();
			if(StringUtils.isNotBlank(roleId)){
			String userName= WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUserId();
			RoleRightInfo[] rightInfos= platformClientUtil.getFrameworkService().getRoleRightList(roleId,userName);
			List<RoleRightVO> roleRightVOList=roleRightDOO2VOS(Arrays.asList(rightInfos));
			roleRightVOMap=roleRightVOList.stream().collect(Collectors.toMap(RoleRightVO::getFuncId,roleRightVO ->roleRightVO,(oldValue,newOldValue)->oldValue));
			roleRightVOMap = this.getRoleRightMap(roleId);
			}
			BizType[] bizTypes=osBtmServiceI.getBizTypes(type);
			BizType[] bizTypes = osBtmServiceI.getBizTypes(type);
			List<Tree> treeList=new ArrayList<>();
			Tree rootNode =new Tree("root","功能模块","root");
			Tree rootNode =new Tree("root","功能模块","root");
			rootNode.setLevel(0);
			rootNode.setShowCheckbox(true);
			rootNode.setExpanded(true);
			List<Tree> childList=new ArrayList<>();

			uiDataFetcher = new UIDataFetcher();
			for (int i = 0; i < bizTypes.length; i++) {
			Tree bizTypeTree = new Tree(bizTypes[i].oid,bizTypes[i].name,bizTypes[i]);//(btmItems[i].label+" ["+ btmItems[i].name+"]", btmItems[i]);
			bizTypeTree.setLevel(1);
			bizTypeTree.setShowCheckbox(true);
			bizTypeTree.setParentId(rootNode.getOid());
			bizTypeTree.setParentName(rootNode.getText());
			bizTypeTree.setShowCheckbox(true);
			bizTypeTree.setParentBtmName(bizTypes[i].name);
			childList.add(bizTypeTree);
			List<PLUILayout>contextList=getUIContextDataByBtName(bizTypes[i].name,context);
			List<Tree> btmChildList=new ArrayList<>();
			List<PLUILayout> contextList = uiDataFetcher.getContext(bizTypes[i].name/+context/);
			List<Tree> btmChildList = new ArrayList<>();
			btmChildList.add(bizTypeTree);
			setChildNode(btmChildList,contextList,roleRightVOMap,showCheckBox);
			childList.add(bizTypeTree);
			}
			rootNode.setChildren(childList);
			treeList.add(rootNode);
			return treeList;
			}

			/***
			/**
			* 根据角色主键获取已授权的信息
			* @param roleId 如果roleId不传，就会获取当前登录的用户的名称查询权限
			* @return
			* @throws PLException
			*/
			@Override
			public Map<String, List<RoleRightVO>> getRoleRightMap(String roleId) throws PLException {
			RoleRightInfo[] rightInfos = null;
			String userName = WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUserId();
			if(Func.isBlank(roleId)){
			rightInfos = platformClientUtil.getFrameworkService().getRoleRightByUserName(userName);
			}else{
			rightInfos = platformClientUtil.getFrameworkService().getRoleRightList(roleId,userName);
			}
			List<RoleRightVO> roleRightVOList = roleRightDOO2VOS(Arrays.asList(rightInfos));
			//分组操作
			Map<String, List<RoleRightVO>> roleRightVOMap = roleRightVOList.stream().collect(Collectors.groupingBy(RoleRightVO::getFuncId,
			Collectors.mapping(e ->e, Collectors.toList())));
			return roleRightVOMap;
			}

			/**
			* UI授权
			* @param uiAuthorDTO
			* @return
			@@ -1399,7 +1758,7 @@
			@Override
			public boolean authorizedUI(UIAuthorDTO uiAuthorDTO) throws Exception {
			boolean res=false;
			if(uiAuthorDTO==null\|\|CollectionUtil.isEmpty(uiAuthorDTO.getSelectTreeList())){
			if(uiAuthorDTO==null\|\| CollectionUtil.isEmpty(uiAuthorDTO.getSelectTreeList())){
			throw new VciBaseException("请选择节点进行授权!");
			}
			BaseQueryObject treeQueryObject=new BaseQueryObject();
			@@ -1409,34 +1768,57 @@
			conditionMap.put("context",uiAuthorDTO.getContext());
			conditionMap.put("showCheckBox","true");
			treeQueryObject.setConditionMap(conditionMap);
			List<Tree> treeList=this.getUIAuthor(treeQueryObject);
			HashMap<String,Tree> allTreeMap=new HashMap<>();
			Map<String,RoleRightDTO> roleRightVOMap=new HashMap<>();
			List<Tree> treeList = this.getUIAuthor(treeQueryObject);
			HashMap<String,Tree> allTreeMap = new HashMap<>();
			//Map<String,RoleRightDTO> roleRightVOMap = new HashMap<>();
			if(!CollectionUtil.isEmpty(treeList)){
			if(StringUtils.isNotBlank(uiAuthorDTO.getRoleId())){
			String userName= WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUserId();
			RoleRightInfo[] rightInfos= platformClientUtil.getFrameworkService().getRoleRightList(uiAuthorDTO.getRoleId(),userName);
			List<RoleRightVO> roleRightVOList=roleRightDOO2VOS(Arrays.asList(rightInfos));
			roleRightVOMap=roleRightVOList.stream().collect(Collectors.toMap(RoleRightVO::getFuncId,roleRightVO ->roleRightVOO2DTO(roleRightVO),(oldValue,newValue)->oldValue));
			}
			/*if(StringUtils.isNotBlank(uiAuthorDTO.getRoleId())){
			String userName = WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUserId();
			RoleRightInfo[] rightInfos = platformClientUtil.getFrameworkService().getRoleRightList(uiAuthorDTO.getRoleId(),userName);
			List<RoleRightVO> roleRightVOList = roleRightDOO2VOS(Arrays.asList(rightInfos));
			roleRightVOMap = roleRightVOList.stream().collect(Collectors.toMap(RoleRightVO::getFuncId,roleRightVO ->roleRightVOO2DTO(roleRightVO),(oldValue,newValue)->oldValue));
			}*/

			convertTreeDOO2Map(treeList,allTreeMap);
			List<RoleRightDTO> roleRightDTOList=new ArrayList<>();
			List<Tree> selectTreeList= uiAuthorDTO.getSelectTreeList();
			getSelectedRoleRightObjs(uiAuthorDTO.getRoleId(),selectTreeList,allTreeMap,roleRightVOMap,roleRightDTOList);
			List<RoleRightDTO> roleRightDTOList = new ArrayList<>();
			List<Tree> selectTreeList = uiAuthorDTO.getSelectTreeList();
			List<Tree> filterSelectTreeList = this.authTreeListConvert(selectTreeList);
			//过滤出选择的按钮
			List<String> checkButtonList = selectTreeList.stream()
			.filter(item -> item.getData() instanceof PLTabButton \|\| item.isLeaf())
			.map(item -> item.getOid()).collect(Collectors.toList());

			getSelectedRoleRightObjs(uiAuthorDTO.getRoleId(),filterSelectTreeList,checkButtonList,allTreeMap,roleRightDTOList);
			SessionInfo sessionInfo = WebThreadLocalUtil.getCurrentUserSessionInfoInThread();
			String currentUserName = sessionInfo.getUserId();
			boolean isDeveloper= rightControlUtil.isDeveloper(currentUserName);
			List<RoleRightInfo> roleRightInfoList= roleRightDTOO2InfoS(roleRightDTOList);
			UserEntityInfo info=new UserEntityInfo();
			//boolean isDeveloper = rightControlUtil.isDeveloper(currentUserName);
			List<RoleRightInfo> roleRightInfoList = roleRightDTOO2InfoS(roleRightDTOList);
			UserEntityInfo info = new UserEntityInfo();
			info.modules="UI授权";
			info.userName=currentUserName;
			info.userName = currentUserName;
			try {
			res= platformClientUtil.getFrameworkService().saveRoleRight(roleRightInfoList.toArray(new RoleRightInfo[]{}),uiAuthorDTO.getRoleId(),currentUserName,info);
			res = platformClientUtil.getFrameworkService().saveRoleRight(roleRightInfoList.toArray(new RoleRightInfo[]{}),uiAuthorDTO.getRoleId(),currentUserName,info);
			}catch (PLException e){
			throw new Exception("保存失败："+e.getMessage());
			throw new Exception("保存失败：" + e.getMessage());
			}
			}
			return res;
			}

			/**
			* 获取筛选后的数据
			* @param selectTreeList
			*/
			private List<Tree> authTreeListConvert(List<Tree> selectTreeList){
			// 创建一个包含另一个集合中满足条件的 oid 的集合
			List<String> validOids = selectTreeList.stream()
			.filter(Tree::isChecked) // checked 为 true
			.map(Tree::getOid) // 提取 oid
			.collect(Collectors.toList());

			return selectTreeList.stream()
			.filter(tree -> tree.isChecked() && !validOids.contains(tree.getParentId())) // 过滤条件
			.collect(Collectors.toList());
			}

			/**
			@@ -1446,39 +1828,40 @@
			* @param allTreeMap
			* @param roleRightDTOList
			*/
			private void getSelectedRoleRightObjs(String roleOid,List<Tree> selectTreeList,HashMap<String,Tree> allTreeMap,Map<String,RoleRightDTO> allRoleRightDTOMap, List<RoleRightDTO> roleRightDTOList){
			Date date=new Date();
			Map<String,RoleRightDTO> roleRightDTOMap=new HashMap<>();
			private void getSelectedRoleRightObjs(String roleOid, List<Tree> selectTreeList, List<String> checkButtonList, HashMap<String,Tree> allTreeMap, List<RoleRightDTO> roleRightDTOList){
			Map<String,RoleRightDTO> roleRightDTOMap = new HashMap<>();

			if(!CollectionUtil.isEmpty(selectTreeList)){
			selectTreeList.stream().forEach(tree -> {
			String oid=tree.getOid();
			String oid = tree.getOid();
			if(allTreeMap.containsKey(oid)){
			tree= allTreeMap.get(oid);
			Object data= tree.getData();
			tree = allTreeMap.get(oid);
			Object data = tree.getData();
			if (data instanceof String) {
			getRightValue(roleOid, tree, allTreeMap, false, roleRightDTOMap);//向下获取所有模块的权限值
			getRightValue(roleOid, tree, allTreeMap, checkButtonList,false, roleRightDTOMap);//向下获取所有模块的权限值
			} else if (!(data instanceof PLTabButton)) {//业务类型
			getRightValue(roleOid, tree, allTreeMap, true, roleRightDTOMap);//向上处理
			getRightValue(roleOid, tree, allTreeMap, false, roleRightDTOMap);//向下处理（包含当前节点）
			getRightValue(roleOid, tree, allTreeMap, checkButtonList, true, roleRightDTOMap);//向上处理
			getRightValue(roleOid, tree, allTreeMap, checkButtonList, false, roleRightDTOMap);//向下处理（包含当前节点）
			} else if (data instanceof PLTabButton) {//按钮
			String parrentId=tree.getParentId();
			if(allTreeMap.containsKey(parrentId)){
			SessionInfo sessionInfo = WebThreadLocalUtil.getCurrentUserSessionInfoInThread();
			String currentUserName = sessionInfo.getUserId();
			boolean isDeveloper= rightControlUtil.isDeveloper(currentUserName);
			boolean isDeveloper = rightControlUtil.isDeveloper(currentUserName);
			Tree parentNode= allTreeMap.get(parrentId);
			String funcId = parentNode.getOid();
			getRightValue(roleOid,tree, allTreeMap, true, roleRightDTOMap);//向上处理该操作父级的上级模块权限(不包含父节点)
			getRightValue(roleOid, parentNode, allTreeMap, checkButtonList, true, roleRightDTOMap);//向上处理该操作父级的上级模块权限(不包含父节点)
			if(!roleRightDTOMap.containsKey(funcId)){
			RoleRightDTO roleRightDTO = new RoleRightDTO();
			roleRightDTO.setId(ObjectUtility.getNewObjectID36());//主键
			roleRightDTO.setFuncId(funcId);
			if(isDeveloper) {
			roleRightDTO.setRightType((short) 1);//权限类型权限类型，超级管理员给管理员授权为1，管理员给普通用户授权为2
			//权限类型权限类型，超级管理员给管理员授权为1，管理员给普通用户授权为2
			roleRightDTO.setRightType((short) 1);
			}else{
			roleRightDTO.setRightType((short) 2);
			}
			roleRightDTO.setRightValue(1);// 权限值，没有操作的模块权限值存储为0
			roleRightDTO.setRightValue(countRightValue(parentNode,checkButtonList,false));// 权限值，没有操作的模块权限值存储为0
			roleRightDTO.setRoleId(roleOid);//角色ID
			roleRightDTO.setCreateUser(currentUserName);//创建者
			roleRightDTO.setCreateTime(VciDateUtil.date2Str(new Date(),""));//创建时间
			@@ -1498,7 +1881,7 @@
			});
			/* allRoleRightDTOMap.putAll(roleRightDTOMap.entrySet().stream()
			.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry:: getValue)));*/
			List<RoleRightDTO> newRoleRightDTOList=Optional.ofNullable(roleRightDTOMap).orElseGet(()->new HashMap<String,RoleRightDTO>()).values().stream().collect(Collectors.toList());
			List<RoleRightDTO> newRoleRightDTOList = Optional.ofNullable(roleRightDTOMap).orElseGet(()->new HashMap<String,RoleRightDTO>()).values().stream().collect(Collectors.toList());
			roleRightDTOList.addAll(newRoleRightDTOList);
			}
			}
			@@ -1507,16 +1890,18 @@
			* 获取权限
			* @param isUp 是否是向上获取，如果是向上获取，传进来的必然是模块节点，且上级模块必然是没有选中
			*/
			private void getRightValue(String roleId,Tree node,HashMap<String,Tree> allTreeMap,boolean isUp,Map<String,RoleRightDTO> rightMap){
			private void getRightValue(String roleId,Tree node,Map<String,Tree> allTreeMap,List<String> checkButton,boolean isUp,Map<String,RoleRightDTO> rightMap){
			SessionInfo sessionInfo = WebThreadLocalUtil.getCurrentUserSessionInfoInThread();
			String currentUserName = sessionInfo.getUserId();
			boolean isDeveloper= rightControlUtil.isDeveloper(currentUserName);
			String id=ObjectUtility.getNewObjectID36();
			Object data=node.getData();
			if(isUp) {//向上获取，存储每个上级模块的权限值
			while (!"root".equals(node.getData())){
			data=node.getData();
			String oid=node.getOid();
			String parentId = node.getParentId();
			Tree parentNode = allTreeMap.get(parentId);
			while (!"root".equals(parentNode.getData())){
			data=parentNode.getData();
			String oid=parentNode.getOid();
			if(allTreeMap.containsKey(oid)){
			String funcId = "";
			if (data instanceof BizType) {
			@@ -1553,9 +1938,9 @@
			if(!rightMap.containsKey(funcId)){
			rightMap.put(funcId, roleRightDTO);
			}
			oid= node.getParentId();
			oid = parentNode.getParentId();
			if(allTreeMap.containsKey(oid)) {
			node=allTreeMap.get(oid);
			parentNode = allTreeMap.get(oid);
			}
			}
			}
			@@ -1599,14 +1984,14 @@
			}
			for (int i = 0; i < node.getChildren().size(); i++) {
			//对每个子向下递归遍历
			getRightValue(roleId, node.getChildren().get(i), allTreeMap, false, rightMap);
			getRightValue(roleId, node.getChildren().get(i), allTreeMap, checkButton,false, rightMap);
			}
			} else {
			if (!rightMap.containsKey(funcId)) {
			RoleRightDTO roleRightDTO = new RoleRightDTO();
			roleRightDTO.setFuncId(funcId);
			roleRightDTO.setRightType((short) 2); // 设置UI权限
			roleRightDTO.setRightValue(countRightValue(node, true));//没有操作的模块权限值存储为0
			roleRightDTO.setRightValue(countRightValue(node, checkButton,true));//没有操作的模块权限值存储为0
			roleRightDTO.setRoleId(roleId);

			roleRightDTO.setCreateUser(currentUserName);
			@@ -1626,12 +2011,13 @@
			* @param isAll 是否子级全部选中
			* @return
			*/
			private long countRightValue(Tree node,boolean isAll){
			private long countRightValue(Tree node,List<String> checkButton,boolean isAll){
			long value = 0;
			for(int i = 0;i < node.getChildren().size();i++){
			for(int i = 0; i < node.getChildren().size(); i++){
			Tree childNode = (Tree)node.getChildren().get(i);
			if(isAll && node.getData() instanceof PLTabButton ){
			PLTabButton obj = (PLTabButton)node.getData();
			//node.getData() instanceof PLTabButton这儿应该换成是否是选中的按钮节点
			if(isAll \|\| checkButton.contains(node.getOid())){
			PLTabButton obj = (PLTabButton)childNode.getData();
			value += (long)Math.pow(2, obj.plSeq);//累计加上各个操作的权限值
			}
			}
			@@ -1653,22 +2039,21 @@
			});
			}

			/***
			/**
			* 遍历子节点
			* @param parentTree
			* @param contextList
			* @param roleRightVOMap
			* @param isShowCheckBox
			*/
			private void setChildNode(List<Tree> parentTree, List<PLUILayout>contextList,Map<String,RoleRightVO> roleRightVOMap,boolean isShowCheckBox){
			Optional.ofNullable(parentTree).orElseGet(()->new ArrayList<Tree>()).stream().forEach(pTree -> {
			Object funcObj= pTree.getData();
			List<Tree> chiledTreeList=new ArrayList<>();
			private void setChildNode_old(List<Tree> parentTree, List<PLUILayout>contextList,Map<String,RoleRightVO> roleRightVOMap,boolean isShowCheckBox){
			Optional.ofNullable(parentTree).orElseGet(()->new ArrayList<>()).stream().forEach(pTree -> {
			Object funcObj = pTree.getData();
			List<Tree> chiledTreeList = new ArrayList<>();
			if (funcObj instanceof BizType) {//业务类型
			BizType bizType = (BizType) funcObj;
			if(!CollectionUtil.isEmpty(contextList)) {
			contextList.stream().forEach(context->{
			Tree childTree=new Tree(context.plOId,context.plName+"("+context.plCode+")",context);
			Tree childTree = new Tree(context.plOId,context.plName+"("+context.plCode+")",context);
			childTree.setParentName(pTree.getText());
			childTree.setParentBtmName(pTree.getParentBtmName());
			childTree.setParentId(pTree.getOid());
			@@ -1679,19 +2064,13 @@
			pTree.setChildren(chiledTreeList);
			}
			if(!CollectionUtil.isEmpty(chiledTreeList)) {
			setChildNode(chiledTreeList, contextList, roleRightVOMap, isShowCheckBox);
			setChildNode_old(chiledTreeList, contextList, roleRightVOMap, isShowCheckBox);
			}
			}else if (funcObj instanceof PLUILayout){//UI
			PLUILayout context = (PLUILayout) funcObj;
			PLTabPage[] pages = new PLTabPage[0];
			try {
			pages = platformClientUtil.getUIService().getPLTabPagesByPageDefinationOId(context.plOId);
			} catch (PLException e) {
			e.printStackTrace();
			}
			if(pages!=null&&pages.length>0){
			List<PLTabPage> plTabPageList= Arrays.stream(pages).collect(Collectors.toList());
			plTabPageList.stream().forEach(plTabPage -> {
			List<PLTabPage> pageList = uiDataFetcher.getTabs(context.plOId);
			if(Func.isNotEmpty(pageList)){
			pageList.stream().forEach(plTabPage -> {
			Tree childTree=new Tree(plTabPage.plOId,plTabPage.plName,plTabPage);
			childTree.setParentName(pTree.getText());
			childTree.setParentId(pTree.getOid());
			@@ -1700,66 +2079,51 @@
			childTree.setShowCheckbox(isShowCheckBox);
			chiledTreeList.add(childTree);
			});
			}
			if(!CollectionUtil.isEmpty(chiledTreeList)) {
			setChildNode_old(chiledTreeList, contextList, roleRightVOMap, isShowCheckBox);
			}
			pTree.setChildren(chiledTreeList);
			}else if (funcObj instanceof PLTabPage) {//上下文
			PLTabPage plTabPage = (PLTabPage) funcObj;
			List<PLPageDefination> pageDefinationList = uiDataFetcher.getComopnent(plTabPage.plOId);
			if(Func.isNotEmpty(pageDefinationList)){
			pageDefinationList.stream().forEach(plPageDefination -> {
			Tree childTree=new Tree(plPageDefination.plOId,plPageDefination.name,plPageDefination);
			childTree.setParentName(pTree.getText());
			childTree.setParentId(pTree.getOid());
			childTree.setParentBtmName(pTree.getParentBtmName());
			childTree.setLevel(pTree.getLevel()+1);
			childTree.setShowCheckbox(isShowCheckBox);
			chiledTreeList.add(childTree);
			});
			pTree.setChildren(chiledTreeList);
			}
			if(!CollectionUtil.isEmpty(chiledTreeList)) {
			setChildNode(chiledTreeList, contextList, roleRightVOMap, isShowCheckBox);
			setChildNode_old(chiledTreeList, contextList, roleRightVOMap, isShowCheckBox);
			}

			}else if (funcObj instanceof PLTabPage) {//上下文
			PLTabPage plTabPage = (PLTabPage) funcObj;
			List<PLPageDefination>plPageDefinationList=new ArrayList<>();
			try {
			PLPageDefination[] pLPageDefinations = platformClientUtil.getUIService().getPLPageDefinationsByPageContextOId(plTabPage.plOId);
			if(pLPageDefinations!=null&&pLPageDefinations.length>0){
			plPageDefinationList= Arrays.stream(pLPageDefinations).collect(Collectors.toList());
			plPageDefinationList.stream().forEach(plPageDefination -> {
			Tree childTree=new Tree(plPageDefination.plOId,plPageDefination.name,plPageDefination);
			childTree.setParentName(pTree.getText());
			childTree.setParentId(pTree.getOid());
			childTree.setParentBtmName(pTree.getParentBtmName());
			childTree.setLevel(pTree.getLevel()+1);
			childTree.setShowCheckbox(isShowCheckBox);
			chiledTreeList.add(childTree);
			});
			pTree.setChildren(chiledTreeList);
			}
			if(!CollectionUtil.isEmpty(chiledTreeList)) {
			setChildNode(chiledTreeList, contextList, roleRightVOMap, isShowCheckBox);
			}
			} catch (PLException e) {
			e.printStackTrace();
			}

			}else if (funcObj instanceof PLPageDefination) {//
			}else if (funcObj instanceof PLPageDefination) {
			PLPageDefination plPageDefination = (PLPageDefination) funcObj;
			try {
			List<PLTabButton>plTabButtonList=new ArrayList<>();
			PLTabButton[] pLTabButtons = platformClientUtil.getUIService().getPLTabButtonsByTableOId(plPageDefination.plOId);
			if(pLTabButtons!=null&&pLTabButtons.length>0){
			plTabButtonList= Arrays.stream(pLTabButtons).collect(Collectors.toList());
			plTabButtonList.stream().forEach(plTabButton -> {
			Tree childTree=new Tree(plTabButton.plOId,plTabButton.plLabel,plTabButton);
			childTree.setParentName(pTree.getText());
			childTree.setParentId(pTree.getOid());
			childTree.setParentBtmName(pTree.getParentBtmName());
			childTree.setLevel(pTree.getLevel()+1);
			childTree.setShowCheckbox(isShowCheckBox);
			childTree.setLeaf(true);
			chiledTreeList.add(childTree);
			});
			pTree.setChildren(chiledTreeList);
			}
			if(!CollectionUtil.isEmpty(chiledTreeList)) {
			setChildNode(chiledTreeList, contextList, roleRightVOMap, isShowCheckBox);
			}
			} catch (PLException e) {
			e.printStackTrace();
			List<PLTabButton> pLTabButtonList = uiDataFetcher.getButtons(plPageDefination.plOId);
			if(Func.isNotEmpty(pLTabButtonList)){
			pLTabButtonList.stream().forEach(plTabButton -> {
			Tree childTree=new Tree(plTabButton.plOId,plTabButton.plLabel,plTabButton);
			childTree.setParentName(pTree.getText());
			childTree.setParentId(pTree.getOid());
			childTree.setParentBtmName(pTree.getParentBtmName());
			childTree.setLevel(pTree.getLevel()+1);
			childTree.setShowCheckbox(isShowCheckBox);
			childTree.setLeaf(true);
			chiledTreeList.add(childTree);
			});
			pTree.setChildren(chiledTreeList);
			}

			if(!CollectionUtil.isEmpty(chiledTreeList)) {
			setChildNode_old(chiledTreeList, contextList, roleRightVOMap, isShowCheckBox);
			}
			}else if (funcObj instanceof PLTabButton) {//按钮
			PLTabButton plTabButton= (PLTabButton) funcObj;
			String id =plTabButton.plTableOId;
			PLTabButton plTabButton = (PLTabButton) funcObj;
			String id = plTabButton.plTableOId;
			if(roleRightVOMap.containsKey(id)){
			RoleRightVO roleRightVO = roleRightVOMap.get(id);
			Long rightValue = roleRightVO.getRightValue();
			@@ -1777,6 +2141,106 @@
			});
			}

			/**
			* 遍历子节点
			* @param parentTree
			* @param contextList
			* @param isShowCheckBox
			*/
			private void setChildNode(List<Tree> parentTree, List<PLUILayout>contextList,Map<String, List<RoleRightVO>> roleRightVOMap, boolean isShowCheckBox){
			Optional.ofNullable(parentTree).orElseGet(()->new ArrayList<>()).stream().forEach(pTree -> {
			Object funcObj = pTree.getData();
			List<Tree> chiledTreeList = new ArrayList<>();
			if (funcObj instanceof BizType) {//业务类型
			if(!CollectionUtil.isEmpty(contextList)) {
			contextList.stream().forEach(context->{
			Tree childTree = new Tree(context.plOId,context.plName+"("+context.plCode+")",context);
			childTree.setParentName(pTree.getText());
			childTree.setParentBtmName(pTree.getParentBtmName());
			childTree.setParentId(pTree.getOid());
			childTree.setLevel(pTree.getLevel()+1);
			childTree.setShowCheckbox(isShowCheckBox);
			chiledTreeList.add(childTree);
			});
			pTree.setChildren(chiledTreeList);
			}
			if(!CollectionUtil.isEmpty(chiledTreeList)) {
			setChildNode(chiledTreeList, contextList,roleRightVOMap, isShowCheckBox);
			}
			}else if (funcObj instanceof PLUILayout){//UI
			PLUILayout context = (PLUILayout) funcObj;
			List<PLTabPage> pageList = uiDataFetcher.getTabs(context.plOId);
			if(Func.isNotEmpty(pageList)){
			pageList.stream().forEach(plTabPage -> {
			Tree childTree=new Tree(plTabPage.plOId,plTabPage.plName,plTabPage);
			childTree.setParentName(pTree.getText());
			childTree.setParentId(pTree.getOid());
			childTree.setParentBtmName(pTree.getParentBtmName());
			childTree.setLevel(pTree.getLevel()+1);
			childTree.setShowCheckbox(isShowCheckBox);
			chiledTreeList.add(childTree);
			});
			}
			if(!CollectionUtil.isEmpty(chiledTreeList)) {
			setChildNode(chiledTreeList, contextList,roleRightVOMap, isShowCheckBox);
			}
			pTree.setChildren(chiledTreeList);
			}else if (funcObj instanceof PLTabPage) {//上下文
			PLTabPage plTabPage = (PLTabPage) funcObj;
			List<PLPageDefination> pageDefinationList = uiDataFetcher.getComopnent(plTabPage.plOId);
			if(Func.isNotEmpty(pageDefinationList)){
			pageDefinationList.stream().forEach(plPageDefination -> {
			Tree childTree=new Tree(plPageDefination.plOId,plPageDefination.name,plPageDefination);
			childTree.setParentName(pTree.getText());
			childTree.setParentId(pTree.getOid());
			childTree.setParentBtmName(pTree.getParentBtmName());
			childTree.setLevel(pTree.getLevel()+1);
			childTree.setShowCheckbox(isShowCheckBox);
			chiledTreeList.add(childTree);
			});
			pTree.setChildren(chiledTreeList);
			}
			if(!CollectionUtil.isEmpty(chiledTreeList)) {
			setChildNode(chiledTreeList, contextList,roleRightVOMap, isShowCheckBox);
			}
			}else if (funcObj instanceof PLPageDefination) {
			PLPageDefination plPageDefination = (PLPageDefination) funcObj;
			List<PLTabButton> pLTabButtonList = uiDataFetcher.getButtons(plPageDefination.plOId);
			if(Func.isNotEmpty(pLTabButtonList)){
			pLTabButtonList.stream().forEach(plTabButton -> {
			Tree childTree=new Tree(plTabButton.plOId,plTabButton.plLabel,plTabButton);
			childTree.setParentName(pTree.getText());
			childTree.setParentId(pTree.getOid());
			childTree.setParentBtmName(pTree.getParentBtmName());
			childTree.setLevel(pTree.getLevel()+1);
			childTree.setShowCheckbox(isShowCheckBox);
			childTree.setLeaf(true);
			chiledTreeList.add(childTree);
			});
			pTree.setChildren(chiledTreeList);
			}
			if(!CollectionUtil.isEmpty(chiledTreeList)) {
			setChildNode(chiledTreeList, contextList,roleRightVOMap, isShowCheckBox);
			}
			}else if (funcObj instanceof PLTabButton) {//按钮
			PLTabButton plTabButton = (PLTabButton) funcObj;
			String id = plTabButton.plTableOId;
			if(roleRightVOMap.containsKey(id)){
			RoleRightVO roleRightVO = roleRightVOMap.get(id).get(0);
			Long rightValue = roleRightVO.getRightValue();
			int nodeValue = plTabButton.plSeq;
			if (nodeValue >= 0 && nodeValue <= 63) {
			long preValue = (rightValue >> nodeValue) & 1;
			if (preValue == 1) {
			pTree.setChecked(true);
			}
			}
			}else{
			pTree.setChecked(false);
			}
			}
			});
			}

			/**
			* UI角色对象转换
			@@ -1793,8 +2257,6 @@
			return roleRightVOS;
			}



			/**
			* UI角色对象转换
			* @param infos
			@@ -1809,6 +2271,7 @@

			return roleRightVOS;
			}

			/**
			* UI角色对象转换
			* @param dtos
			@@ -1828,6 +2291,7 @@

			return roleRightInfoList;
			}

			/**
			* UI角色对象转换
			* @param info
			@@ -1847,12 +2311,13 @@
			vo.setModifyUser(info.modifyUser);
			return vo;
			}

			/**
			* UI角色对象转换
			* @param vo
			* @return
			*/
			private RoleRightDTO roleRightVOO2DTO(RoleRightVO vo){
			private RoleRightDTO roleRightVOO2DTO(RoleRightVO vo){
			RoleRightDTO dto=new RoleRightDTO();
			dto.setId(vo.getId());
			dto.setCreateTime(vo.getCreateTime());
			@@ -1872,7 +2337,7 @@
			* @param dto
			* @return
			*/
			private RoleRightInfo roleRightDTOO2Info(RoleRightDTO dto) throws Exception {
			private RoleRightInfo roleRightDTOO2Info(RoleRightDTO dto) throws Exception {
			RoleRightInfo info=new RoleRightInfo();
			info.id=StringUtils.isBlank(dto.getId())?"":dto.getId();
			info.createTime=StringUtils.isBlank(dto.getCreateTime())?new Date().getTime():VciDateUtil.getTime(VciDateUtil.str2Date(dto.getCreateTime(),""));
			@@ -1940,7 +2405,7 @@
			* @param obj
			* @throws PLException
			*/
			public void checkCodeName(PLUILayout obj) throws PLException {
			private void checkCodeName(PLUILayout obj) throws PLException {
			PLUILayout[] plUILayouts = platformClientUtil.getUIService().getPLUILayoutsByRelatedType(obj.plRelatedType);
			int length = plUILayouts.length;
			String code = obj.plCode;
			@@ -2004,6 +2469,680 @@
			}
			}
			return res;
			}

			/**
			* 业务类型、源对象类型、顶层节点显示类型等都调用这个接口查询
			* @param baseQueryObject
			* @return
			* @throws PLException
			*/
			public DataGrid<BizType> getBtmDatasByPage(BaseQueryObject baseQueryObject) throws PLException{
			BizType[] btmNames = null;
			int start = baseQueryObject.getPage();
			int end = baseQueryObject.getLimit();
			//全查的情况
			/*if(limit != -1){
			start = baseQueryObject.getPage() <= 1 ? 1 : (page - 1) * limit + 1;
			end = baseQueryObject.getPage() <= 1 ? limit : (page * limit);
			}*/

			String where = " 1=1 ";
			String text = "";
			Map<String, String> conditionMap = baseQueryObject.getConditionMap();
			if(Func.isNotEmpty(conditionMap)){
			//过滤条件
			String filterInputValue = conditionMap.get("filterInputValue");
			if(Func.isNotBlank(filterInputValue)){
			where += String.format(" and (bt.name like '%%%s%%' or bt.label like '%%%s%%')", text, text);
			}
			}

			String fromWhere = String.format(" from plbtmtype bt where %s ", where);
			String fromWhereOrderBy = String.format(" %s order by bt.name", fromWhere);
			String sql = "";
			if(end != -1){
			sql = sql+String.format("select * from(" +
			" select row_.*,rownum rownum_ from( " +
			" select bt.name, bt.label %s" +
			" ) row_ " +
			") where rownum_ >= %d and rownum_ <= %d ", fromWhereOrderBy, start, end);
			}else{
			sql = sql+String.format(
			"select bt.name, bt.label %s", fromWhereOrderBy);
			}
			List<BizType> list = new LinkedList<BizType>();
			String[][] kvss = platformClientUtil.getQueryService().queryBySqlWithoutKey(sql);
			for(String[] kvs : kvss){
			BizType bi = new BizType();
			bi.name = kvs[0];
			bi.label = kvs[1];
			list.add(bi);
			}
			btmNames = list.toArray(new BizType[]{});

			sql = String.format("select count(1) count_ %s", fromWhere);
			kvss = platformClientUtil.getQueryService().queryBySqlWithoutKey(sql);
			int total = Integer.valueOf(kvss[0][0]);

			DataGrid<BizType> res = new DataGrid<>();
			res.setData(Arrays.asList(btmNames));
			res.setTotal(total);
			return res;
			}

			/**
			* 查询链接类型下拉
			* @param baseQueryObject
			* @return
			* @throws PLException
			*/
			public DataGrid<LinkType> getLinkDatasByPage(BaseQueryObject baseQueryObject) throws PLException{
			List<LinkType> list = new ArrayList<>();
			Map<String, LinkType> map = new HashMap<>();
			LinkType[] lts = platformClientUtil.getLinkTypeService().getLinkTypes();
			for (LinkType lt : lts) {
			Map<String, String> conditionMap = baseQueryObject.getConditionMap();
			if(Func.isNotEmpty(conditionMap)){
			//选择的对象类型
			String selectBtmType = conditionMap.get("selectBtmType");
			if(selectBtmType != null){
			boolean existFrom = existInArray(selectBtmType, lt.btmItemsFrom);
			boolean existTo = existInArray(selectBtmType, lt.btmItemsTo);
			if(existFrom \|\| existTo){
			if(!map.containsKey(lt.name)){
			map.put(lt.name, lt);
			list.add(lt);
			}
			}
			}
			}
			}
			DataGrid<LinkType> res = new DataGrid<>();
			res.setData(list);
			res.setTotal(list.size());
			return res;
			}

			private boolean existInArray(String value, String[] values){
			boolean res = false;
			for (String string : values) {
			if(string.equals(value)){
			res = true;
			break;
			}
			}
			return res;
			}

			/**
			* UI定义下拉查询（templateType为UI定义时的UI定义下拉查询）
			* @param baseQueryObject selectBtmType 选择的源对象,带分页信息
			* @return
			* @throws PLException
			*/
			public DataGrid<PLUILayout> getUILayoutDatasByPage(BaseQueryObject baseQueryObject) throws PLException{
			PLUILayout[] datas = null;
			int start = baseQueryObject.getPage();
			int end = baseQueryObject.getLimit();
			/int start = baseQueryObject.getPage() <= 1 ? 1 : (baseQueryObject.getPage() - 1) baseQueryObject.getLimit() + 1;
			int end = baseQueryObject.getPage() <= 1 ? baseQueryObject.getLimit() : (baseQueryObject.getPage() * baseQueryObject.getLimit());*/

			String where = " 1=1 ";
			Map<String, String> conditionMap = baseQueryObject.getConditionMap();
			if(Func.isNotEmpty(conditionMap)){
			//选择的对象类型
			String selectBtmType = conditionMap.get("selectBtmType");
			if(selectBtmType != null){
			where += String.format(" and ui.PLRELATEDTYPE = '%s' ", selectBtmType);
			}
			//过滤条件
			String filterInputValue = conditionMap.get("filterInputValue");
			if(Func.isNotBlank(filterInputValue)){
			where += String.format(" and (ui.plname like '%%%s%%') ", filterInputValue, filterInputValue);
			}
			}
			String fromWhere = String.format(" from PLUILAYOUT ui where %s ", where);
			String fromWhereOrderBy = String.format(" %s order by ui.plname", fromWhere);
			String sql = "";
			if(end != -1){
			sql = String.format("select * from(" +
			" select row_.*,rownum rownum_ from( " +
			" select ui.plname, ui.plcode %s" +
			" ) row_ " +
			") where rownum_ >= %d and rownum_ <= %d ", fromWhereOrderBy, start, end);
			}else{
			sql = String.format("select ui.plname, ui.plcode %s", fromWhereOrderBy);
			}
			List<PLUILayout> list = new LinkedList<PLUILayout>();
			String[][] kvss = platformClientUtil.getQueryService().queryBySqlWithoutKey(sql);
			for(String[] kvs : kvss){
			PLUILayout bi = new PLUILayout();
			bi.plName = kvs[0];
			bi.plCode = kvs[1];
			list.add(bi);
			}
			datas = list.toArray(new PLUILayout[0]);

			sql = String.format("select count(1) count_ %s", fromWhere);
			kvss = platformClientUtil.getQueryService().queryBySqlWithoutKey(sql);
			int total = Integer.valueOf(kvss[0][0]);

			DataGrid<PLUILayout> res = new DataGrid<PLUILayout>();
			res.setData(Arrays.asList(datas));
			res.setTotal(total);
			return res;
			}

			/**
			* 选择模板下拉查询（templateType为表格、表单、树表时的选择对象下拉查询）
			* @param baseQueryObject
			* @return
			* @throws PLException
			*/
			public DataGrid<PortalVI> getPortalVIDatasByPage(BaseQueryObject baseQueryObject) throws PLException{
			PortalVI[] datas = null;

			int start = baseQueryObject.getPage();
			int end = baseQueryObject.getLimit();
			/int start = baseQueryObject.getPage() <= 1 ? 1 : (baseQueryObject.getPage() - 1) baseQueryObject.getLimit() + 1;
			int end = baseQueryObject.getPage() <= 1 ? baseQueryObject.getLimit() : (baseQueryObject.getPage() * baseQueryObject.getLimit());*/

			String where = " 1=1 ";

			Map<String, String> conditionMap = baseQueryObject.getConditionMap();
			if(Func.isNotEmpty(conditionMap)){
			//选择的源对象或者是选择的父节点显示类型
			String selectBtmType = conditionMap.get("selectBtmType");
			if(selectBtmType != null){
			where += String.format(" and vi.typename = '%s' ", selectBtmType);
			}
			/*if(getPopupDialog().getPortalVIType() != null){
			where += String.format(" and vi.vitype = %d ", getPopupDialog().getPortalVIType().getIntVal());
			}*/
			//过滤条件
			String filterInputValue = conditionMap.get("filterInputValue");
			if(Func.isNotBlank(filterInputValue)){
			where += String.format(" and (vi.viname like '%%%s%%') ", filterInputValue, filterInputValue);
			}
			}

			String fromWhere = String.format(" from plportalvi vi where %s ", where);
			String fromWhereOrderBy = String.format(" %s order by vi.viname", fromWhere);
			String sql = "";
			if(end != -1){
			sql = String.format("select * from(" +
			" select row_.*,rownum rownum_ from( " +
			" select vi.viname,vi.vitype %s" +
			" ) row_ " +
			") where rownum_ >= %d and rownum_ <= %d ", fromWhereOrderBy, start, end);
			}else{
			sql = String.format("select vi.viname,vi.vitype %s", fromWhereOrderBy);
			}
			List<PortalVI> list = new LinkedList<>();
			String[][] kvss = platformClientUtil.getQueryService().queryBySqlWithoutKey(sql);
			for(String[] kvs : kvss){
			PortalVI bi = new PortalVI();
			bi.viName = kvs[0];
			bi.viType = Short.valueOf(kvs[1]);
			list.add(bi);
			}
			datas = list.toArray(new PortalVI[]{});

			sql = String.format("select count(1) count_ %s", fromWhere);
			kvss = platformClientUtil.getQueryService().queryBySqlWithoutKey(sql);
			int total = Integer.valueOf(kvss[0][0]);

			DataGrid<PortalVI> res = new DataGrid<>();
			res.setData(Arrays.asList(datas));
			res.setTotal(total);
			return res;
			}

			/**
			* 查询模板下拉查询
			* @param baseQueryObject
			* @return
			* @throws PLException
			*/
			public DataGrid<QTInfo> getQTInfoDatasByPage(BaseQueryObject baseQueryObject) throws PLException{
			QTInfo[] datas = null;

			int start = baseQueryObject.getPage();
			int end = baseQueryObject.getLimit();
			/int start = baseQueryObject.getPage() <= 1 ? 1 : (baseQueryObject.getPage() - 1) baseQueryObject.getLimit() + 1;
			int end = baseQueryObject.getPage() <= 1 ? baseQueryObject.getLimit() : (baseQueryObject.getPage() * baseQueryObject.getLimit());*/

			String where = " 1=1 ";

			Map<String, String> conditionMap = baseQueryObject.getConditionMap();
			if(Func.isNotEmpty(conditionMap)){
			//选择的源对象或者是选择的父节点显示类型
			String selectBtmType = conditionMap.get("selectBtmType");
			if(selectBtmType != null){
			where += String.format(" and qt.btmname = '%s' ", selectBtmType);
			}
			//过滤条件
			String filterInputValue = conditionMap.get("filterInputValue");
			if(Func.isNotBlank(filterInputValue)){
			where += String.format(" and (qt.qtname like '%%%s%%') ", filterInputValue, filterInputValue);
			}
			}

			String fromWhere = String.format(" from PL_QTEMPLATE qt where %s ", where);
			String fromWhereOrderBy = String.format(" %s order by qt.qtname ", fromWhere);
			String sql = "";
			if(end != -1){
			sql = String.format("select * from(" +
			" select row_.*,rownum rownum_ from( " +
			" select qt.qtname,qt.btmname %s" +
			" ) row_ " +
			") where rownum_ >= %d and rownum_ <= %d ", fromWhereOrderBy, start, end);
			}else{
			sql = String.format("select qt.qtname,qt.btmname %s", fromWhereOrderBy);
			}
			List<QTInfo> list = new LinkedList<QTInfo>();
			String[][] kvss = platformClientUtil.getQueryService().queryBySqlWithoutKey(sql);
			for(String[] kvs : kvss){
			QTInfo bi = new QTInfo();
			bi.qtName = kvs[0];
			bi.btmName = kvs[1];
			list.add(bi);
			}
			datas = list.toArray(new QTInfo[]{});

			sql = String.format("select count(1) count_ %s", fromWhere);
			kvss = platformClientUtil.getQueryService().queryBySqlWithoutKey(sql);
			int total = Integer.valueOf(kvss[0][0]);

			DataGrid<QTInfo> res = new DataGrid<QTInfo>();
			res.setData(Arrays.asList(datas));
			res.setTotal(total);
			return res;
			}

			/**
			* 通过业务类型获取UI上下文包含其下关联的区域定义>页面定义等所有关联数据，归纳成tree结构
			* @param btmName 业务类型名称
			* @param level 查询到那个层级为止（ui、tab、pageDef）
			* @return
			*/
			public Tree getAllLevelTreeByBtm(String btmName,String level) throws PLException {
			VciBaseUtil.alertNotNull(btmName,"业务类型编号",level,"查询层级");
			Tree resTree = new Tree();
			resTree.setText("UI上下文选项");
			resTree.setId("UILayout");
			resTree.setLeaf(false);
			resTree.setLevel(1);
			String level1Oid = ObjectUtility.getNewObjectID36();
			resTree.setOid(level1Oid);

			PLUILayout[] pluiLayouts = platformClientUtil.getUIService().getPLUILayoutsByRelatedType(btmName);
			if(Func.isEmpty(pluiLayouts)){
			return resTree;
			}
			//根据查询的层级不同决定是否返回
			List<Tree> uiChildrenTree = new ArrayList<>();

			Arrays.stream(pluiLayouts).forEach(item->{
			Tree uiTree = new Tree();
			uiTree.setLeaf(level.equals("ui"));
			uiTree.setLevel(2);
			uiTree.setId(item.plCode);
			uiTree.setOid(item.plOId);
			uiTree.setText(item.plCode + "(" + item.plName + ")");
			uiTree.setParentId(level1Oid);
			List<Tree> tabChildren = null;
			if(!level.equalsIgnoreCase("ui")){
			try {
			tabChildren = this.getTabChildren(item.plOId, level);
			} catch (PLException e) {
			e.printStackTrace();
			String exceptionMessage = "查询页签时出现错误："+VciBaseUtil.getExceptionMessage(e);
			logger.error(exceptionMessage);
			throw new VciBaseException(exceptionMessage);
			}
			uiTree.setChildren(tabChildren);
			}
			uiChildrenTree.add(uiTree);
			});

			resTree.setChildren(uiChildrenTree);
			return resTree;
			}

			/**
			* 克隆页签
			* @param uiCloneVO
			* @return
			* @throws Throwable
			*/
			@Override
			public BaseResult clonetabPage(UICloneVO uiCloneVO) throws Throwable {
			VciBaseUtil.alertNotNull(uiCloneVO,"克隆对象",uiCloneVO.getFromOId(),"源关联的UI定义对象的主键");
			//源关联对象的主键(UI定义的主键)
			String fromOId = uiCloneVO.getFromOId();
			//克隆到那个UI定义下
			String toOId = uiCloneVO.getToOId();
			//被克隆的对象主键
			Map<String, String> cloneParamMap = uiCloneVO.getCloneParam();
			String sourceOId = cloneParamMap.get("sourceOId");
			if(Func.isBlank(sourceOId)){
			return BaseResult.fail("未从请求参数中获取到，源对象主键！！");
			}
			//判断是否有目标主键，如果没有就说明是克隆到当前页签下
			if(Func.isBlank(toOId)){
			toOId = fromOId;
			}
			//查询被克隆的页签定义
			PLTabPage tabPage = this.platformClientUtil.getUIService().getPLTabPageById(sourceOId);
			if(Func.isEmpty(tabPage) \|\| Func.isBlank(tabPage.plOId)){
			return BaseResult.fail("根据源对象主键未查询到源对象，请刷新后重试！！");
			}
			//在克隆的目标UI定义下同一区域进行页签名称、编号、序号查重处理
			String copyObjName = tabPage.plName;//名称
			String copyObjCode = tabPage.plCode;//编号
			String copyObjSeq = String.valueOf(tabPage.plSeq);//序号
			PLTabPage[] tabPages = platformClientUtil.getUIService().getTabPagesByContextIdAndType(toOId, tabPage.plAreaType);//同一区域下的
			if (Func.isNotEmpty(tabPages)) {
			Map<String, Short> toTabPageDefMap = Arrays.stream(tabPages).collect(Collectors.toMap(item -> item.plName, item -> item.plSeq));
			//while循环出toPageDefMap不存在的复制对象名
			int i = 1;
			int i1 = 1;
			String name = tabPage.plName;
			while(true){
			copyObjName = name + "_copy(" + i++ + ")";
			if (!toTabPageDefMap.containsValue(copyObjName)) {
			break;
			}
			}
			Set<String> tabPageCodes = Arrays.stream(tabPages).map(item -> item.plCode).collect(Collectors.toSet());
			String code = tabPage.plCode;
			while(true){
			copyObjCode = code + "_copy(" + i1++ + ")";
			if (!tabPageCodes.contains(copyObjCode)) {
			break;
			}
			}
			//获取到values的最大值
			Short currentSeq = toTabPageDefMap.values().stream().max(Comparator.naturalOrder()).get();
			copyObjSeq = String.valueOf(currentSeq+1);
			}
			//修改关联的UI定义主键、名称、编号、序号
			tabPage.plContextOId = toOId;
			//新的克隆对象主键
			String newOId = ObjectUtility.getNewObjectID36();
			tabPage.plOId = newOId;
			tabPage.plName = copyObjName;
			tabPage.plCode = copyObjCode;
			tabPage.plSeq = Short.parseShort(copyObjSeq);
			SessionInfo sessionInfo = WebThreadLocalUtil.getCurrentUserSessionInfoInThread();
			tabPage.plCreateUser = sessionInfo.getUserId();
			tabPage.plModifyUser = sessionInfo.getUserId();
			long currentTimeMillis = System.currentTimeMillis();
			tabPage.plCreateTime = currentTimeMillis;
			tabPage.plModifyTime = currentTimeMillis;
			boolean resTabPage = this.platformClientUtil.getUIService().savePLTabPage(tabPage);
			if(!resTabPage){
			return BaseResult.fail("页面定义保存失败！！");
			}
			//保存成功需要考虑到之前不存在的区域，克隆之后存在了就需要改变对应区域的标识
			PLUILayout pluiLayout = this.platformClientUtil.getUIService().getPLUILayoutById(toOId);
			if(Func.isNotEmpty(pluiLayout)){
			if(tabPage.plAreaType == 1){
			//导航区
			pluiLayout.plIsShowNavigator = 1;
			}else if(tabPage.plAreaType == 2){
			//控制区
			pluiLayout.plIsShowForm = 1;
			}else {
			//操作区
			pluiLayout.plIsShowTab = 1;
			}
			}
			this.platformClientUtil.getUIService().updatePLUILayout(pluiLayout);

			//查询页面定义
			PLPageDefination[] pageDefinations = platformClientUtil.getUIService().getPLPageDefinationsByPageContextOId(sourceOId);
			if (Func.isEmpty(pageDefinations)) {
			return BaseResult.success("页签定义克隆成功！！");
			}
			String oldPageDefOId = "";
			boolean resPageDef = false;
			for (int i = 0; i < pageDefinations.length; i++) {
			PLPageDefination pageDef = pageDefinations[i];
			pageDef.plTabPageOId = newOId;
			String newPageDefOId = ObjectUtility.getNewObjectID36();
			oldPageDefOId = pageDef.plOId;//记录下旧的主键
			pageDef.plOId = newPageDefOId;
			resPageDef = platformClientUtil.getUIService().savePLPageDefination(pageDef);
			if(!resPageDef){
			return BaseResult.success("克隆页面定义出错！！");
			}
			//查询按钮进行保存
			List<PLTabButtonVO> tabButtons = this.getTabButtons(oldPageDefOId);
			if(Func.isNotEmpty(tabButtons)){
			tabButtons.stream().forEach(buttonVO->{
			try {
			this.modifyButtonOIdsAndCopy(buttonVO,newPageDefOId,ObjectUtility.getNewObjectID36());
			} catch (PLException e) {
			e.printStackTrace();
			String exceptionMessage = "克隆按钮配置时出现错误，原因："+VciBaseUtil.getExceptionMessage(e);
			logger.error(exceptionMessage);
			throw new VciBaseException(exceptionMessage);
			}
			});
			}
			}
			return BaseResult.success("页签定义克隆成功！！");
			}

			/**
			* 克隆页面定义
			* @param uiCloneVO
			* @return
			* @throws Throwable
			*/
			@Override
			public BaseResult clonePageDef(UICloneVO uiCloneVO) throws Throwable {
			VciBaseUtil.alertNotNull(uiCloneVO,"克隆对象",uiCloneVO.getFromOId(),"源关联对象的主键");
			//源关联对象的主键
			String fromOId = uiCloneVO.getFromOId();
			//克隆到那个页签下：tabOid
			String toOId = uiCloneVO.getToOId();
			//被克隆的对象主键
			Map<String, String> cloneParamMap = uiCloneVO.getCloneParam();
			String sourceOId = cloneParamMap.get("sourceOId");
			if(Func.isBlank(sourceOId)){
			return BaseResult.fail("未从请求参数中获取到，源对象主键！！");
			}
			//判断是否有目标主键，如果没有就说明是克隆到当前页签下
			if(Func.isBlank(toOId)){
			toOId = fromOId;
			}
			//查询被克隆的页面定义对象
			PLPageDefination pageDefination = this.platformClientUtil.getUIService().getPLPageDefinationById(sourceOId);
			if(Func.isEmpty(pageDefination) \|\| Func.isBlank(pageDefination.plOId)){
			return BaseResult.fail("根据源对象主键未查询到源对象，请刷新后重试！！");
			}

			String copyObjName = "";//名称
			String copyObjSeq = "";//编号
			//克隆之前查重目标关联对象下的对象名称和编号判重处理
			PLPageDefination[] pageDefinations = this.platformClientUtil.getUIService().getPLPageDefinationsByPageContextOId(toOId);
			if (Func.isNotEmpty(pageDefinations)) {
			Map<String, Short> toPageDefMap = Arrays.stream(pageDefinations).collect(Collectors.toMap(item -> item.name, item -> item.seq));
			//while循环出toPageDefMap不存在的复制对象名
			int i = 1;
			String name = pageDefination.name;
			while(true){
			copyObjName = name + "_copy(" + i++ + ")";
			if (!toPageDefMap.containsValue(copyObjName)) {
			break;
			}
			}

			//获取到values的最大值
			Short currentSeq = toPageDefMap.values().stream().max(Comparator.naturalOrder()).get();
			copyObjSeq = String.valueOf(currentSeq+1);
			}
			//修改关联的页签主键和名称编号
			pageDefination.plTabPageOId = toOId;
			String newOId = ObjectUtility.getNewObjectID36();
			pageDefination.plOId = newOId;
			pageDefination.name = copyObjName;
			pageDefination.seq = Short.parseShort(copyObjSeq);
			//保存页面定义
			boolean resPageDef = platformClientUtil.getUIService().savePLPageDefination(pageDefination);
			if(!resPageDef){
			return BaseResult.fail("页签定义保存失败！！");
			}
			//查询页面下的按钮
			List<PLTabButtonVO> tabButtonVOS = this.getTabButtons(sourceOId);
			if(Func.isEmpty(tabButtonVOS)){
			return BaseResult.success("页面定义克隆成功！！");
			}
			//初始化sessionInfo属性
			SessionInfo sessionInfo = WebThreadLocalUtil.getCurrentUserSessionInfoInThread();
			//循环克隆按钮（同时会对按钮的父子级关系和按钮下的参数进行保存）
			tabButtonVOS.stream().forEach(buttonVO->{
			try {
			this.modifyButtonOIdsAndCopy(buttonVO,newOId,ObjectUtility.getNewObjectID36());
			} catch (PLException e) {
			e.printStackTrace();
			String exceptionMessage = "克隆按钮配置时出现错误，原因："+VciBaseUtil.getExceptionMessage(e);
			logger.error(exceptionMessage);
			throw new VciBaseException(exceptionMessage);
			}
			});
			return BaseResult.success("页面定义克隆成功！！");
			}

			/**
			* 克隆按钮（存在父子结构关系、关联数据按钮参数）
			* @param uiCloneVO
			* @return
			* @throws Throwable
			*/
			@Override
			public BaseResult cloneTabButton(UICloneVO uiCloneVO) throws Throwable {
			VciBaseUtil.alertNotNull(uiCloneVO,"克隆对象",uiCloneVO.getFromOId(),"源关联对象主键");
			String fromOId = uiCloneVO.getFromOId();
			String toOId = uiCloneVO.getToOId();
			//先查询源对象
			//PLTabButton tabButton = platformClientUtil.getUIService().getPLTabButtonById(fromOId);
			String sourceOId = uiCloneVO.getCloneParam().get("sourceOId");
			if(Func.isBlank(sourceOId)){
			return BaseResult.fail("未从请求参数中获取到，源对象主键！！");
			}
			//判断是否有目标主键，如果没有就说明是克隆到当前页面下
			if(Func.isBlank(toOId)){
			toOId = fromOId;
			}
			//判断前端是否传了克隆名过来（按钮这边不需要名称、编号判重，所以这一块儿逻辑忽略）
			//按钮具有父子级关系，所以还需要做oid和parentOId处理
			List<PLTabButtonVO> tabButtons = this.getTabButtons(fromOId);//TODO:这儿涉及到转VO操作和子按钮查询的操作所以很慢
			PLTabButtonVO filterTabButton = tabButtons.stream()
			.filter(item -> item.getOId().equals(sourceOId)).findFirst().orElse(null);
			if(Func.isEmpty(filterTabButton)){
			return BaseResult.fail("根据源对象主键未查询到源对象，请刷新后重试！！");
			}
			SessionInfo sessionInfo = WebThreadLocalUtil.getCurrentUserSessionInfoInThread();

			//改变button对象的oid和parentOId
			this.modifyButtonOIdsAndCopy(filterTabButton,toOId,ObjectUtility.getNewObjectID36());

			return BaseResult.success("按钮复制成功！");
			}

			/**
			* 修改oId和parentOid，不改变父子级（oid变换parentOId也需要跟着变换）结构，并保存按钮和其参数
			* @param button 需要修改主键保存的按钮对象
			* @param toOId 按钮关联的页面定义oid
			* @param newOId 新的按钮对象主键
			* @throws PLException
			*/
			private void modifyButtonOIdsAndCopy(PLTabButtonVO button,String toOId, String newOId) throws PLException {
			if (button == null) {
			return;
			}

			// 修改当前节点的oId
			button.setOId(newOId);
			SessionInfo sessionInfo = WebThreadLocalUtil.getCurrentUserSessionInfoInThread();
			//开始保存按钮和参数
			button.setCreateUser(sessionInfo.getUserId());
			button.setModifyUser(sessionInfo.getUserId());
			button.setTableOId(toOId);
			PLTabButton plTabButton = this.tabButtonVO2TabButton(new PLTabButton(), button);
			boolean res = platformClientUtil.getUIService().savePLTabButton(plTabButton);
			if(!res){
			throw new PLException("500",new String[]{"按钮配置复制失败！"});
			}
			this.saveButtonParams(button.getButtonParams(),button.getOId());

			// 递归遍历子节点
			if (button.getChildren() != null) {
			for (PLTabButtonVO child : button.getChildren()) {
			// 子对象的 parentOid 设置为当前节点的新oid
			child.setParentOid(button.getOId()); // 确保子对象的parentOid指向当前的oid
			modifyButtonOIdsAndCopy(child,toOId, ObjectUtility.getNewObjectID36());
			}
			}
			}

			/**
			* 获取页签这一层的关联数据
			* @return
			*/
			private List<Tree> getTabChildren(String uiLayoutOid,String level) throws PLException {
			List<Tree> tabChildren = new ArrayList<>();
			if(Func.isNotBlank(uiLayoutOid)){
			PLTabPage[] tabPages = platformClientUtil.getUIService().getPLTabPagesByPageDefinationOId(uiLayoutOid);
			Arrays.stream(tabPages).forEach(tabPage->{
			Tree tabTree = new Tree();
			tabTree.setLeaf(level.equals("tab"));
			tabTree.setLevel(2);
			tabTree.setId(tabPage.plCode);
			tabTree.setOid(tabPage.plOId);
			tabTree.setText(tabPage.plCode + "(" + tabPage.plName + ")");
			tabTree.setParentId(uiLayoutOid);
			if(!level.equalsIgnoreCase("tab")){
			try {
			tabTree.setChildren(this.getPageDefChildren(tabPage.plOId));
			} catch (PLException e) {
			e.printStackTrace();
			String exceptionMessage = "查询页面定义时出现错误："+VciBaseUtil.getExceptionMessage(e);
			logger.error(exceptionMessage);
			throw new VciBaseException(exceptionMessage);
			}
			}
			tabChildren.add(tabTree);
			});
			}
			return tabChildren;
			}

			/**
			* 获取页面定义这一层的关联数据
			* @return
			*/
			private List<Tree> getPageDefChildren(String tabPageOid) throws PLException {
			List<Tree> pageDefChildren = new ArrayList<>();
			if(Func.isNotBlank(tabPageOid)){
			PLPageDefination[] pageDefs = platformClientUtil.getUIService().getPLPageDefinationsByPageContextOId(tabPageOid);
			Arrays.stream(pageDefs).forEach(pageDef->{
			Tree tabTree = new Tree();
			tabTree.setLeaf(true);
			tabTree.setLevel(2);
			tabTree.setId(pageDef.name);
			tabTree.setOid(pageDef.plOId);
			tabTree.setText(pageDef.name + "(" + pageDef.desc + ")");
			tabTree.setParentId(tabPageOid);
			pageDefChildren.add(tabTree);
			});
			}
			return pageDefChildren;
			}

			//基础公共检查接口
			@@ -2204,11 +3343,10 @@
			*/
			protected boolean checkQTIsExist(String tip, String txtQTName, String txtType) throws PLException {
			boolean res = false;

			String sql = "select count(1) count_ from PL_QTEMPLATE qt " +
			"where qt.btmname ='" + txtType.trim() + "' " +
			"and qt.qtname='" + txtQTName.trim() + "'";

			res = checkCountNotEqualZero(sql);
			if(!res){
			throw new PLException("500",
			new String[]{String.format("%s %s 无效！", tip, txtQTName)});
			@@ -2393,7 +3531,7 @@
			*/
			private boolean checkLinkTypeInputIsOk(String txtVIName/选择的模板/,String txtQTName/查询模板/,String btmType) throws PLException {
			boolean res = false;
			if(!(this.checkBtmTypeTxtIsOk("目标对象", linkType,true))){
			if(!(this.checkLinkTypeTxtIsOk("目标对象", linkType,true))){
			res = false;
			} else if(!(this.checkPortalVITxtIsOk("选择模板", txtVIName, linkType,true))){
			res = false;
			@@ -2466,6 +3604,7 @@
			d.setSearchTarger(searchTarger);
			d.setShowType(btmType);
			d.setTemplateId(txtVIName);
			d.setOrientation("positive");
			d.setQueryTemplateName(txtQTName);
			d.setExpandCols(expandCols);
			d.setExpandMode(expandMode);
			@@ -2563,6 +3702,7 @@
			d.setShowType(btmType);
			d.setLinkType(linkType);
			d.setTemplateId(queryTemplateName);
			d.setOrientation("positive");
			d.setRootContent(showExpressionRoot.trim());
			d.setShowAbs(showExpression.trim());
			d.setShowLinkAbs(refTreeSet.trim());
			@@ -2578,7 +3718,7 @@
			return res;
			}
			// 链接类型不为空时，需要同时检查链接类型及链接类型下的查询模板是否有效
			if(Func.isBlank(linkType)){
			if(Func.isNotBlank(linkType)){
			if(!(super.checkLinkTypeTxtIsOk("链接类型", linkType,false))){
			res = false;
			return res;
			@@ -2588,7 +3728,7 @@
			}
			} else {
			// 链接类型为空时，只需要检查业务类型下的查询模板是否有效
			if(!(super.checkQTNameTxtIsOk("查询模板", queryTemplateName, btmType))){
			if(!(super.checkQTNameTxtIsOk("查询模板", queryTemplateName, btmType,true))){
			res = false;
			return res;
			}