Merge branch 'v3.5.1' into dev

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>estateagents</artifactId>
-	<version>v3.5.1</version>
+	<version>v3.5.1.0</version>
 	<name>estateages</name>
 	<description>置业经纪人</description>
 

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

@@ -166,7 +166,7 @@ public class TaNewsController extends BaseController {
         taNews.setCityId(cityId);
         taNews.setOrgId(getOrgId(request));
         ResponseBean responseBean = iTaNewsService.updateTaNews(taNews);
-        if ("0".equals(String.valueOf(taNews.getNewsStatus()))){
+        if ("1".equals(String.valueOf(taNews.getNewsStatus()))){
             // 设置为取消发布以后把轮播图和资讯设置为停用
             iExtendContentService.updateActivity(String.valueOf(id),"news",getOrgId(request));
         }

src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java

@@ -549,6 +549,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
         QueryWrapper<TaBuildingApartment> buildingApartmentQueryWrapper = new QueryWrapper<>();
         buildingApartmentQueryWrapper.eq("apartment_id", building.getApartmentId());
+        building.setInsideArea(building.getInsideArea() == null ? 0d : building.getInsideArea());
         taBuildingApartmentMapper.update(building,buildingApartmentQueryWrapper);
 
         JSONObject jsonobject = JSONObject.parseObject(parameter);

src/main/java/com/huiju/estateagents/service/impl/TaPersonServiceImpl.java

@@ -86,6 +86,9 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
 
     @Autowired
     private TaShareContentService taShareContentService;
+    
+    @Autowired
+    private TaBuildingMapper taBuildingMapper;
 
 
     @Resource
@@ -232,10 +235,13 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         // 获取关联项目
         List<TaPersonBuilding> buildingList = getPersonBuildings(user.getUserId().toString());
         List<String> buildings = new ArrayList<>();
+        TaBuilding taBuilding = new TaBuilding();
         if (null != buildingList && buildingList.size() > 0) {
             for(TaPersonBuilding b: buildingList) {
                 buildings.add(b.getBuildingId());
             }
+            //获取楼盘信息
+            taBuilding = taBuildingMapper.selectById(buildingList.get(0).getBuildingId());
         }
 
         Map<String, Object> result = new HashMap<>();
@@ -255,7 +261,8 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         result.put("liked", false);
         result.put("unReadNum", 0);
         result.put("projects", buildings);
-        result.put("address", user.getAddress());
+        result.put("address", taBuilding.getAddress());
+        result.put("coordinate", taBuilding.getCoordinate());
         result.put("personTags",person.getPersonTags());
         result.put("posters",taPosterService.getPostersForTarget(user.getUserId().toString(),CommConstant.POSTER_CONTENT_TYPE_PERSON));
         result.put("shareContent",taShareContentService.getPostersForTarget(user.getUserId().toString(),CommConstant.POSTER_CONTENT_TYPE_PERSON));

src/main/java/com/huiju/estateagents/service/impl/TdCityServiceImpl.java

@@ -42,7 +42,7 @@ public class TdCityServiceImpl extends ServiceImpl<TdCityMapper, TdCity> impleme
      * 根据经纬度获取城市详情信息
      *
      * @param location
-     * @return  
+     * @return
      */
     @Override
     public TdCity getLocationCity(String location) {