From 948917aab4194a93e9ade2dc26b0639e6d93a6c4 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 16 六月 2023 17:51:08 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmEngineService.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 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 7374475..43a405f 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
@@ -103,7 +103,7 @@
* @param cboList 鏁版嵁鐨勫唴瀹�
*/
void batchSaveSelectChar(CodeClassifyTemplateVO templateVO, /*List<ClientBusinessObject> cboList*/
- List<String> cboList);
+ List<BaseModel> cboList);
/**
* 浣跨敤妯℃澘鐨勪富閿幏鍙栬〃鍗曠殑淇℃伅
@@ -418,14 +418,15 @@
* @param attrName 灞炴�х殑鍚嶅瓧
* @return true 琛ㄧず搴旇蹇界暐
*/
- 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));
- }
+ 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