From 336265194a47bcbdbd5f8d2274d10a6284ee1246 Mon Sep 17 00:00:00 2001
From: mamc <1428594221@qq.com>
Date: 星期三, 28 六月 2023 14:43:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmEngineService.java | 28 +++++++++++++---------------
1 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmEngineService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmEngineService.java
index 43a405f..2aa4c91 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmEngineService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmEngineService.java
@@ -1,6 +1,7 @@
package com.vci.ubcs.code.service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
import com.vci.ubcs.code.bo.CodeTemplateAttrSqlBO;
@@ -11,15 +12,13 @@
import com.vci.ubcs.code.vo.CodeKeyAttrRepeatVO;
import com.vci.ubcs.code.vo.pagemodel.UITableFieldVO;
import com.vci.ubcs.code.vo.pagemodel.*;
+import com.vci.ubcs.omd.vo.BtmTypeVO;
import com.vci.ubcs.starter.revision.model.BaseModel;
import com.vci.ubcs.starter.revision.model.TreeQueryObject;
import com.vci.ubcs.starter.web.pagemodel.*;
import com.vci.ubcs.starter.web.util.VciQueryWrapperForDO;
import org.springblade.core.tool.api.R;
-import java.beans.IntrospectionException;
-import java.lang.reflect.InvocationTargetException;
-import java.sql.SQLException;
import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -400,10 +399,9 @@
/**
* 榛樿鍒楄〃
* @param referConfigVO
- * @param pageHelper
* @return
*/
- DataGrid referDataGrid(UIFormReferVO referConfigVO, PageHelper pageHelper);
+ Page<BaseModel> referDataGrid(UIFormReferVO referConfigVO, BaseQueryObject baseQueryObject);
/**
@@ -413,20 +411,20 @@
*/
List<Tree> referTree(UIFormReferVO referConfigVO, TreeQueryObject queryObject);
+
/**
* 鏄惁涓轰慨鏀瑰拷鐣ョ殑灞炴��
* @param attrName 灞炴�х殑鍚嶅瓧
* @return true 琛ㄧず搴旇蹇界暐
*/
- boolean checkUnAttrUnEdit(String attrName);
-// {
-// return (VciQueryWrapperForDO.OID_FIELD.equalsIgnoreCase(attrName)
-// ||"ts".equalsIgnoreCase(attrName)
-// || "lastmodifier".equalsIgnoreCase(attrName)
-// || "lastmodifytime".equalsIgnoreCase(attrName)
-// || "createtime".equalsIgnoreCase(attrName)
-// || "checkintime".equalsIgnoreCase(attrName)
-// ||"checkouttime".equalsIgnoreCase(attrName));
-// }
+ default boolean checkUnAttrUnEdit(String attrName){
+ return (VciQueryWrapperForDO.OID_FIELD.equalsIgnoreCase(attrName)
+ ||"ts".equalsIgnoreCase(attrName)
+ || "lastmodifier".equalsIgnoreCase(attrName)
+ || "lastmodifytime".equalsIgnoreCase(attrName)
+ || "createtime".equalsIgnoreCase(attrName)
+ || "checkintime".equalsIgnoreCase(attrName)
+ ||"checkouttime".equalsIgnoreCase(attrName));
+ }
}
--
Gitblit v1.9.3