|
@@ -114,7 +114,7 @@ object DictDefClassService : SObjectService<DefClass>(SMybatisDao(DefClass::clas
|
|
dictSchemeCategoryList = defClassService.select(
|
|
dictSchemeCategoryList = defClassService.select(
|
|
SFilter.eq("parentCode","equipment"),
|
|
SFilter.eq("parentCode","equipment"),
|
|
SFilter.eq("projectId",projectId!!)
|
|
SFilter.eq("projectId",projectId!!)
|
|
- ).exec()
|
|
|
|
|
|
+ ).order("code").exec()
|
|
|
|
|
|
}
|
|
}
|
|
"component" -> {
|
|
"component" -> {
|
|
@@ -125,7 +125,7 @@ object DictDefClassService : SObjectService<DefClass>(SMybatisDao(DefClass::clas
|
|
dictSchemeCategoryList = defClassService.select(
|
|
dictSchemeCategoryList = defClassService.select(
|
|
SFilter.eq("parentCode","component"),
|
|
SFilter.eq("parentCode","component"),
|
|
SFilter.eq("projectId",projectId!!)
|
|
SFilter.eq("projectId",projectId!!)
|
|
- ).exec()
|
|
|
|
|
|
+ ).order("code").exec()
|
|
}
|
|
}
|
|
"system" -> {
|
|
"system" -> {
|
|
// queryBuilder = select(SFilter.eq(SLength("id"), 2), SFilter.not(SFilter.eq("parentId","AllProfessionalSystemEquipment")))
|
|
// queryBuilder = select(SFilter.eq(SLength("id"), 2), SFilter.not(SFilter.eq("parentId","AllProfessionalSystemEquipment")))
|