Ver código fonte

change 更新

18339543638 4 anos atrás
pai
commit
de93b987f2

+ 2 - 2
jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/service/LocalGeoRegionService.java

@@ -44,8 +44,8 @@ public class LocalGeoRegionService extends GenericReactiveTreeSupportCrudService
                 this.createUpdate()
                     .where(GeoRegionEntity::getId,parentId)
                     .set(GeoRegionEntity::getChildrenNum,count)
-                    .execute())
-            .then();
+                    .execute()
+                    .then());
     }
 
     @Override

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

@@ -68,18 +68,8 @@ public class GeoController  implements ReactiveTreeServiceQueryController<GeoReg
                 .flatMap(ignore-> geoService.updateChildrenNum(region.getParentId())).then():
             geoService.findById(id)
                 .zipWith(geoService.save(Mono.just(region)))
-                .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());
-                })
+                .flatMap(tp2->geoService.updateChildrenNum(tp2.getT1().getParentId()))
+                .concatWith(geoService.updateChildrenNum(region.getParentId()))
                 .then();
     }