|
@@ -441,7 +441,6 @@ open class SBaseService<ENTITY: Any> {
|
|
|
// 如果为1对1,直接取对象类型
|
|
|
cascadeField.type
|
|
|
}
|
|
|
-
|
|
|
val idList = entityIdList(entityMap)
|
|
|
val relationList = baseDao.relationQuery(cascadeAnno.table, cascadeAnno.idColumn, cascadeAnno.childIdColumn, cascadeAnno.self, cascadeAnno.filter, idList)
|
|
|
// 如果未取到关联数据,则开始取下一个关联对象
|
|
@@ -456,7 +455,6 @@ open class SBaseService<ENTITY: Any> {
|
|
|
val service = SBaseService(cascadeClass)
|
|
|
val sqlBuilder = service.select(cascade.filters)
|
|
|
sqlBuilder.filter(SFilter.inList(cascadeClass.keyFieldList()[0].name, relationMap.keys.toList()))
|
|
|
-
|
|
|
/** 排序条件 */
|
|
|
if (null != cascade.orders) {
|
|
|
sqlBuilder.order(cascade.orders!!)
|
|
@@ -509,7 +507,6 @@ open class SBaseService<ENTITY: Any> {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
/** 如果需要进行级联查询 */
|
|
|
if (cascade.cascade != null && cascade.cascade!!.size > 0 &&
|
|
|
childrenList.size > 0) {
|