|
@@ -1327,7 +1327,7 @@ object DClassDefService : SObjectService<DefClass>(SMybatisDao(DefClass::class.j
|
|
|
defFuncId.firstTag = ParamTools.TwoLevelCode(dictPlatformInfo.firstTag!!)
|
|
|
}
|
|
|
defFuncId.formater = dictPlatformInfo.formater
|
|
|
- defFuncId.groupCode = if (dictPlatformInfo.groupCode.isNullOrEmpty()) "0" else dictPlatformInfo.groupCode
|
|
|
+ defFuncId.groupCode = dictPlatformInfo.groupCode
|
|
|
defFuncId.idx = dictPlatformInfo.idx
|
|
|
defFuncId.inputMode = dictPlatformInfo.inputMode
|
|
|
defFuncId.isMultiple = dictPlatformInfo.isMultiple
|
|
@@ -1335,7 +1335,7 @@ object DClassDefService : SObjectService<DefClass>(SMybatisDao(DefClass::class.j
|
|
|
defFuncId.name = dictPlatformInfo.name
|
|
|
defFuncId.note = dictPlatformInfo.note
|
|
|
defFuncId.priority = dictPlatformInfo.priority
|
|
|
- defFuncId.projectId = if (dictPlatformInfo.projectId.isNullOrEmpty()) "0" else dictPlatformInfo.projectId
|
|
|
+ defFuncId.projectId = dictPlatformInfo.projectId
|
|
|
defFuncId.readonly = dictPlatformInfo.readonly
|
|
|
defFuncId.secondName = dictPlatformInfo.secondTag
|
|
|
if (!dictPlatformInfo.secondTag.isNullOrEmpty()){
|
|
@@ -1375,22 +1375,22 @@ object DClassDefService : SObjectService<DefClass>(SMybatisDao(DefClass::class.j
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- val dicConfigureEditable = ParamTools.dicConfigureEditable()
|
|
|
- val containsKey = dicConfigureEditable.containsKey(defFuncId.code!!)
|
|
|
- if (containsKey){
|
|
|
- defFuncId.editable = false
|
|
|
- defFuncId.unDisabled = false
|
|
|
- defFuncId.visible = false
|
|
|
- }
|
|
|
- val dicConfigure = ParamTools.dicConfigure()
|
|
|
- if (defFuncId.code!=null){
|
|
|
- val containsKey = dicConfigure.containsKey(defFuncId.code!!)
|
|
|
- if (containsKey){
|
|
|
- defFuncId.editable = true
|
|
|
- defFuncId.unDisabled = false
|
|
|
- defFuncId.visible = true
|
|
|
- }
|
|
|
- }
|
|
|
+// val dicConfigureEditable = ParamTools.dicConfigureEditable()
|
|
|
+// val containsKey = dicConfigureEditable.containsKey(defFuncId.code!!)
|
|
|
+// if (containsKey){
|
|
|
+// defFuncId.editable = false
|
|
|
+// defFuncId.unDisabled = false
|
|
|
+// defFuncId.visible = false
|
|
|
+// }
|
|
|
+// val dicConfigure = ParamTools.dicConfigure()
|
|
|
+// if (defFuncId.code!=null){
|
|
|
+// val containsKey = dicConfigure.containsKey(defFuncId.code!!)
|
|
|
+// if (containsKey){
|
|
|
+// defFuncId.editable = true
|
|
|
+// defFuncId.unDisabled = false
|
|
|
+// defFuncId.visible = true
|
|
|
+// }
|
|
|
+// }
|
|
|
defFuncIdGather.replace(defFuncId)
|
|
|
}
|
|
|
}
|