|
@@ -176,7 +176,12 @@ open class GraphicTypeMapperService {
|
|
|
count += exec.size
|
|
|
}
|
|
|
}else if (n =="r_sp2sp"){
|
|
|
- val exec = rSp2SpService.select(SFilter.eq("projectId", projectId), SFilter.eq("type", relationTypeProject.relationType!!)).exec()
|
|
|
+ val exec: ArrayList<RSp2Sp>
|
|
|
+ if(!relationTypeProject.zoneType.isNullOrEmpty()){
|
|
|
+ exec = rSp2SpService.select(SFilter.eq("projectId", projectId), SFilter.eq("type", relationTypeProject.relationType!!), SFilter.eq("zoneType",relationTypeProject.zoneType!!)).exec()
|
|
|
+ }else{
|
|
|
+ exec = rSp2SpService.select(SFilter.eq("projectId", projectId), SFilter.eq("type", relationTypeProject.relationType!!)).exec()
|
|
|
+ }
|
|
|
count += exec.size
|
|
|
}else if (n == "property_eq"){
|
|
|
val exec = PropertyService.select(SFilter.eq("projectId", projectId), SFilter.not(SFilter.isNull("equipId"))).exec()
|