Selaa lähdekoodia

change 更新

18339543638 4 vuotta sitten
vanhempi
commit
d97c3e8838

+ 12 - 2
jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/web/GeoController.java

@@ -68,8 +68,18 @@ public class GeoController  implements ReactiveTreeServiceQueryController<GeoReg
                 .flatMap(ignore-> geoService.updateChildrenNum(region.getParentId())).then():
             geoService.findById(id)
                 .zipWith(geoService.save(Mono.just(region)))
-                .flatMap(tp2->geoService.updateChildrenNum(tp2.getT1().getParentId()))
-                .flatMap(ignore->geoService.updateChildrenNum(region.getParentId()))
+                .flatMap(tp2->{
+                    if(StrUtil.isEmpty(tp2.getT1().getParentId())){
+                        return Mono.just(tp2);
+                    }
+                    return geoService.updateChildrenNum(tp2.getT1().getParentId());
+                })
+                .flatMap(ignore->{
+                    if(StrUtil.isEmpty(region.getParentId())){
+                        return Mono.just(ignore);
+                    }
+                    return geoService.updateChildrenNum(region.getParentId());
+                })
                 .then();
     }