|
@@ -467,15 +467,14 @@ object GeneralSystemService : Service<GeneralSystem>(SMybatisDao(GeneralSystem::
|
|
// else if(floorId.isNullOrEmpty()&&buildingId.isNullOrEmpty()){
|
|
// else if(floorId.isNullOrEmpty()&&buildingId.isNullOrEmpty()){
|
|
// /** 楼层id为空,建筑id为空 ---> 查询所有 */
|
|
// /** 楼层id为空,建筑id为空 ---> 查询所有 */
|
|
// }
|
|
// }
|
|
- logger.debug("id01= ${list.toJson()}")
|
|
|
|
|
|
+// logger.debug("id01= ${list.toJson()}")
|
|
val pageInfo = pageQuery(request, list)
|
|
val pageInfo = pageQuery(request, list)
|
|
-
|
|
|
|
-// for(system in pageInfo.content!!){
|
|
|
|
-// val queryBuilder = buildingFloorInfoService.selectAll()
|
|
|
|
-// queryBuilder.tableName="f_get_bd_and_fl('${system.id}','$buildingId','$floorId')"
|
|
|
|
-// val bdflList = queryBuilder.exec()
|
|
|
|
-// system.buildingFloorInfoList = bdflList
|
|
|
|
-// }
|
|
|
|
|
|
+ for(system in pageInfo.content!!){
|
|
|
|
+ val queryBuilder = buildingFloorInfoService.selectAll()
|
|
|
|
+ queryBuilder.tableName="f_get_bd_and_fl('${system.id}','$buildingId','$floorId')"
|
|
|
|
+ val bdflList = queryBuilder.exec()
|
|
|
|
+ system.buildingFloorInfoList = bdflList
|
|
|
|
+ }
|
|
return pageInfo
|
|
return pageInfo
|
|
} // Fun pageQuerys
|
|
} // Fun pageQuerys
|
|
|
|
|