Bladeren bron

******************WX *********************
修改关系发送消息

zhangweixin 4 jaren geleden
bovenliggende
commit
48da05a8d9

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/RelZoneSpaceConnectedSp.kt

@@ -42,7 +42,7 @@ open class RelZoneSpaceConnectedSp: SpaceBaseZone() {
 
     /** 级联-空间 */
     @Schema(description = "级联-空间")
-    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'sp2sp_SpaceNeighborhood_5'" )
+    @SCascade(table="relationship.r_sp2sp", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'sp2sp_SpaceNeighborhood_5';zoneType = 'AirConditioningZone'" )
     @JSONField(name = "objectInfo")
     var objectInfo: ArrayList<RelZoneSpace>? = null
 

+ 1 - 1
datacenter/src/main/kotlin/com/persagy/server/services/graphtype/GraphicTypeMapperService.kt

@@ -352,7 +352,7 @@ open class GraphicTypeMapperService {
                                 val rEq2SyList = rEq2SyService.select(SFilter.eq("projectId", projectId),
                                     SFilter.eq("type", relationTypeProject.relationType!!)).exec()
                                 count += rEq2SyList.size
-                            }else if (!n.isNullOrEmpty()){
+                            }else  if (!n.isNullOrEmpty()){
                                 if (!relationTypeProject.relationType.isNullOrEmpty()) {
                                     count += mapper.relationCountRelType(n, projectId,relationTypeProject.relationType!!)
                                 }