|
@@ -135,14 +135,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!!),
|
|
|
+ var funcIdList = DefFuncIdService.select(SFilter.eq("projectId", Opt.projectId!!),SFilter.eq("classCode", category),
|
|
|
SFilter.inList("code", setCode.toList())).order("code").exec()
|
|
|
if (funcIdList.size == 0 ) {
|
|
|
funcIdList = DefFuncIdService.select(SFilter.eq("type","group"),
|
|
|
- SFilter.eq("groupCode",Opt.groupCode!!),
|
|
|
+ SFilter.eq("groupCode",Opt.groupCode!!),SFilter.eq("classCode", category),
|
|
|
SFilter.inList("code", setCode.toList())).order("code").exec()
|
|
|
if (funcIdList.size == 0) {
|
|
|
- funcIdList = DefFuncIdService.select(SFilter.eq("type","common"),
|
|
|
+ funcIdList = DefFuncIdService.select(SFilter.eq("type","common"),SFilter.eq("classCode", category),
|
|
|
SFilter.inList("code", setCode.toList())).order("code").exec()
|
|
|
}
|
|
|
}
|