建筑BUG

smart-city-platform/src/main/java/com/bz/smart_city/entity/Building.java

@@ -170,14 +170,14 @@ public class Building implements Serializable {
     private LocalDateTime createDate;
 
     @ApiModelProperty(value = "创建人", position = 51, hidden = true)
-    private String createBy = "system";
+    private String createBy;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新时间", position = 52, hidden = true)
     private LocalDateTime updateDate = LocalDateTime.now();
 
     @ApiModelProperty(value = "更新用户", position = 53, hidden = true)
-    private String updateBy = "system";
+    private String updateBy;
 
     @ApiModelProperty(value = "小区", position = 54)
     private Integer community;

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/BuildingServiceImpl.java

@@ -1104,15 +1104,18 @@ public class BuildingServiceImpl implements BuildingService {
             throw new ServiceException(-900, "建筑名称已经存在");
         }
         Community community = communityMapper.findById(building.getCommunity());
-        if(building.getProvince() == null || building.getProvince() == 0){
-            building.setProvince(community.getProvince());
-        }
-        if(building.getCity() == null || building.getCity() == 0){
-            building.setCity(community.getCity());
-        }
-        if(building.getRegion() == null || building.getRegion() == 0){
-            building.setRegion(community.getRegion());
+        if (community != null) {
+            if(building.getProvince() == null || building.getProvince() == 0){
+                building.setProvince(community.getProvince());
+            }
+            if(building.getCity() == null || building.getCity() == 0){
+                building.setCity(community.getCity());
+            }
+            if(building.getRegion() == null || building.getRegion() == 0){
+                building.setRegion(community.getRegion());
+            }
         }
+
         int result = this.updateByPrimaryKeySelective(building);
         //添加建筑