|
@@ -3825,6 +3825,7 @@ open class ManualRelationCalcService {
|
|
|
listSF.add(SFilter.or(SFilter.contain("name2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
}
|
|
|
listSF.add(SFilter.eq("projectId", projectId))
|
|
|
+ listSF.add(SFilter.eq("type", manualRelationCalcRequest.relType!!))
|
|
|
val rSp2SpTwoList = CommonServices.rSp2SpTwoService.select(listSF).exec()
|
|
|
if (rSp2SpTwoList.size>0) {
|
|
|
|
|
@@ -3834,6 +3835,7 @@ open class ManualRelationCalcService {
|
|
|
listId1.add(rSp2SpTwo.id1!!)
|
|
|
listId2.add(rSp2SpTwo.id2!!)
|
|
|
}
|
|
|
+ logger.debug("id1 = ${listId1.size}")
|
|
|
val sCascadeQuery = sQueryRequest.cascade!!.get(0)
|
|
|
sCascadeQuery.filters = "id in ${listId2.toJson()}"
|
|
|
list.add(SFilter.inList("id",listId1.toList()))
|