|
@@ -202,22 +202,22 @@ object DefFuncIdService: SObjectService<DefFuncId>(SMybatisDao(DefFuncId::class.
|
|
|
for (equipTypeProject in equipTypeProjectList){
|
|
|
equipTypeList.add(equipTypeProject.classCode!!)
|
|
|
}
|
|
|
- val dictInfosWanDaGroupList = dictInfosWanDaService.select(SFilter.eq("groupCode", Opt.groupCode!!), SFilter.eq("projectId", "0"),SFilter.inList("classCode", equipTypeList)).exec()
|
|
|
- val dictInfosWanDaProjectList = dictInfosWanDaService.select(SFilter.eq("groupCode", Opt.groupCode!!), SFilter.eq("projectId", Opt.projectId!!),SFilter.inList("classCode", equipTypeList)).exec()
|
|
|
- val setCode = HashSet<String>()
|
|
|
- for (dictInfosWanDaGroup in dictInfosWanDaGroupList){
|
|
|
- setCode.add(dictInfosWanDaGroup.classCode!!)
|
|
|
- }
|
|
|
- if (dictInfosWanDaProjectList.size>0){
|
|
|
- for (dictInfosWanDaProject in dictInfosWanDaProjectList){
|
|
|
- setCode.add(dictInfosWanDaProject.classCode!!)
|
|
|
- }
|
|
|
- }
|
|
|
- var defClassList = defClassService.select(SFilter.eq("projectId", Opt.projectId!!), SFilter.inList("code", setCode.toList())).order("code").exec()
|
|
|
+// val dictInfosWanDaGroupList = dictInfosWanDaService.select(SFilter.eq("groupCode", Opt.groupCode!!), SFilter.eq("projectId", "0"),SFilter.inList("classCode", equipTypeList)).exec()
|
|
|
+// val dictInfosWanDaProjectList = dictInfosWanDaService.select(SFilter.eq("groupCode", Opt.groupCode!!), SFilter.eq("projectId", Opt.projectId!!),SFilter.inList("classCode", equipTypeList)).exec()
|
|
|
+// val setCode = HashSet<String>()
|
|
|
+// for (dictInfosWanDaGroup in dictInfosWanDaGroupList){
|
|
|
+// setCode.add(dictInfosWanDaGroup.classCode!!)
|
|
|
+// }
|
|
|
+// if (dictInfosWanDaProjectList.size>0){
|
|
|
+// for (dictInfosWanDaProject in dictInfosWanDaProjectList){
|
|
|
+// setCode.add(dictInfosWanDaProject.classCode!!)
|
|
|
+// }
|
|
|
+// }
|
|
|
+ var defClassList = defClassService.select(SFilter.eq("projectId", Opt.projectId!!), SFilter.inList("code", equipTypeList)).order("code").exec()
|
|
|
if (defClassList.size == 0){
|
|
|
- defClassList = defClassService.select(SFilter.eq("type","group"), SFilter.eq("groupCode",Opt.groupCode!!),SFilter.inList("code", setCode.toList())).order("code").exec()
|
|
|
+ defClassList = defClassService.select(SFilter.eq("type","group"), SFilter.eq("groupCode",Opt.groupCode!!),SFilter.inList("code", equipTypeList)).order("code").exec()
|
|
|
if (defClassList.size == 0){
|
|
|
- defClassList = defClassService.select(SFilter.eq("type", "common"), SFilter.inList("code", setCode.toList())).order("code").exec()
|
|
|
+ defClassList = defClassService.select(SFilter.eq("type", "common"), SFilter.inList("code", equipTypeList)).order("code").exec()
|
|
|
}
|
|
|
}
|
|
|
if (defClassList.size>0){
|