|
@@ -72,7 +72,7 @@ object DefFuncIdService: SObjectService<DefFuncId>(SMybatisDao(DefFuncId::class.
|
|
|
}
|
|
|
var defClassList = defClassService.select(SFilter.eq("projectId", Opt.projectId!!), SFilter.inList("code", setCode.toList())).order("code").exec()
|
|
|
if (defClassList.size == 0){
|
|
|
- defClassList = defClassService.select(SFilter.eq("type","group"), SFilter.inList("code", setCode.toList())).order("code").exec()
|
|
|
+ defClassList = defClassService.select(SFilter.eq("type","group"), SFilter.eq("groupCode",Opt.groupCode!!),SFilter.inList("code", setCode.toList())).order("code").exec()
|
|
|
if (defClassList.size == 0){
|
|
|
defClassList = defClassService.select(SFilter.eq("type", "common"), SFilter.inList("code", setCode.toList())).order("code").exec()
|
|
|
}
|