Merge remote-tracking branch 'origin/dev' into jrz_dev

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/AreaBiz.java

@@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Objects;
 
 import static com.github.wxiaoqi.security.auth.common.constatns.CommonConstants.DATA_ALL_FALSE;
 
@@ -48,8 +49,12 @@ public class AreaBiz extends BaseBiz<AreaMapper, Area> implements UserRestInterf
                 return RestResponse.suc(mapper.findAllByIds(list));
 
             } else {
+                Area area = mapper.selectByPrimaryKey(ids);
+                if (Objects.isNull(area)){
+                    return null;
+                }
                 List<Area> areas = Lists.newArrayList();
-                areas.add(mapper.selectByPrimaryKey(ids));
+                areas.add(area);
                 return RestResponse.suc(areas);
             }
         } else { //拥有全部权限