Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

src/main/java/com/huiju/estateagents/controller/ExtendContentController.java

@@ -207,8 +207,10 @@ public class ExtendContentController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         extendContent.setContentId(id);
         try {
-            Integer cityId = iTaBuildingService.getCityById(extendContent.getBuildingId());
-            extendContent.setCityId(cityId);
+            if (extendContent.getCityId() == null){
+                Integer cityId = iTaBuildingService.getCityById(extendContent.getBuildingId());
+                extendContent.setCityId(cityId);
+            }
             extendContent.setOrgId(getOrgId(request));
             if (iExtendContentService.updateById(extendContent)){
                 responseBean.addSuccess(extendContent);