|
@@ -165,8 +165,14 @@ object DefFuncIdService: SObjectService<DefFuncId>(SMybatisDao(DefFuncId::class.
|
|
|
for (dictInfosWanDaGroup in dictInfosWanDaGroupList){
|
|
|
setCode.add(dictInfosWanDaGroup.code!!)
|
|
|
}
|
|
|
- var funcIdList = DefFuncIdService.select(SFilter.eq("projectId", Opt.projectId!!),SFilter.eq("classCode", category),
|
|
|
+ if (setCode.isNotEmpty()) {
|
|
|
+ var funcIdList = DefFuncIdService.select(SFilter.eq("projectId", Opt.projectId!!),SFilter.eq("classCode", category),
|
|
|
SFilter.inList("code", setCode.toList())).order("code").exec()
|
|
|
+ dictStage.infos = funcIdList
|
|
|
+ }else {
|
|
|
+ dictStage.infos = ArrayList()
|
|
|
+ }
|
|
|
+
|
|
|
// if (funcIdList.size == 0 ) {
|
|
|
// funcIdList = DefFuncIdService.select(SFilter.eq("type","group"),
|
|
|
// SFilter.eq("groupCode",Opt.groupCode!!),SFilter.eq("classCode", category),
|
|
@@ -176,7 +182,7 @@ object DefFuncIdService: SObjectService<DefFuncId>(SMybatisDao(DefFuncId::class.
|
|
|
// SFilter.inList("code", setCode.toList())).order("code").exec()
|
|
|
// }
|
|
|
// }
|
|
|
- dictStage.infos = funcIdList
|
|
|
+
|
|
|
}
|
|
|
dictInfoResponse.basicInfos = defFuncIdList
|
|
|
dictInfoResponse.dictStages = dictStageList
|