|
@@ -437,7 +437,7 @@ open class SBaseService<ENTITY: Any> {
|
|
}
|
|
}
|
|
|
|
|
|
val idList = entityIdList(entityMap)
|
|
val idList = entityIdList(entityMap)
|
|
- val relationList = baseDao.relationQuery(cascadeAnno.table, cascadeAnno.idColumn, cascadeAnno.childIdColumn, cascadeAnno.self, idList)
|
|
|
|
|
|
+ val relationList = baseDao.relationQuery(cascadeAnno.table, cascadeAnno.idColumn, cascadeAnno.childIdColumn, cascadeAnno.self, cascadeAnno.filter, idList)
|
|
// 如果未取到关联数据,则开始取下一个关联对象
|
|
// 如果未取到关联数据,则开始取下一个关联对象
|
|
if (relationList.size <= 0) {
|
|
if (relationList.size <= 0) {
|
|
return
|
|
return
|
|
@@ -523,7 +523,7 @@ open class SBaseService<ENTITY: Any> {
|
|
*/
|
|
*/
|
|
private fun cascadeCount(entityMap: HashMap<Any, Any>, cascadeAnno: SCascadeCount, cascadeField: Field, cascade: SCascadeQuery) {
|
|
private fun cascadeCount(entityMap: HashMap<Any, Any>, cascadeAnno: SCascadeCount, cascadeField: Field, cascade: SCascadeQuery) {
|
|
val idList = entityIdList(entityMap)
|
|
val idList = entityIdList(entityMap)
|
|
- val relationList = baseDao.relationQuery(cascadeAnno.table, cascadeAnno.idColumn, cascadeAnno.childIdColumn, cascadeAnno.self, idList)
|
|
|
|
|
|
+ val relationList = baseDao.relationQuery(cascadeAnno.table, cascadeAnno.idColumn, cascadeAnno.childIdColumn, cascadeAnno.self, cascadeAnno.filter, idList)
|
|
// 如果未取到关联数据,则开始取下一个关联对象
|
|
// 如果未取到关联数据,则开始取下一个关联对象
|
|
if (relationList.size <= 0) {
|
|
if (relationList.size <= 0) {
|
|
return
|
|
return
|