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

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

@@ -49,6 +49,7 @@ public class TaCustomImgController extends BaseController {
             //使用分页插件
 		    IPage<TaCustomImg> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaCustomImg> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("org_id", getOrgId(request));
             queryWrapper.orderByDesc("create_time");
 
             IPage<TaCustomImg> result = iTaCustomImgService.page(pg, queryWrapper);

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

@@ -290,7 +290,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
         TaBuilding building = object.toJavaObject(TaBuilding.class);
 
-        boolean isMainMoreThanTenFlag = countIsMainBuilding(building);
+        boolean isMainMoreThanTenFlag = countIsMainBuilding(building, orgId);
         if (!isMainMoreThanTenFlag){
             responseBean.addError("每个城市只能推荐10个楼盘到首页，请先将已推荐楼盘取消推荐后再推荐当前楼盘。");
             return responseBean;
@@ -404,7 +404,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
         TaBuilding building = object.toJavaObject(TaBuilding.class);
 
-        boolean isMainMoreThanTenFlag = countIsMainBuilding(building);
+        boolean isMainMoreThanTenFlag = countIsMainBuilding(building, orgId);
         if (!isMainMoreThanTenFlag){
             responseBean.addError("每个城市只能推荐10个楼盘到首页，请先将已推荐楼盘取消推荐后再推荐当前楼盘。");
             return responseBean;
@@ -838,7 +838,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
      * @param taBuilding
      * @return
      */
-    public boolean countIsMainBuilding(TaBuilding taBuilding) {
+    public boolean countIsMainBuilding(TaBuilding taBuilding, Integer orgId) {
         if (taBuilding.getIsMain() != 1){
             return true;
         }
@@ -846,7 +846,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         taBuildingQueryWrapper.eq("city_id", taBuilding.getCityId());
         taBuildingQueryWrapper.eq("is_main", 1);
         taBuildingQueryWrapper.eq("status", 1);
-        taBuildingQueryWrapper.eq("org_id", taBuilding.getOrgId());
+        taBuildingQueryWrapper.eq("org_id", orgId);
         if (taBuilding.getBuildingId() != null){
             taBuildingQueryWrapper.ne("building_id", taBuilding.getBuildingId());
         }

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

@@ -214,7 +214,7 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
         //发送给发起者
         TaPerson taPerson = taPersonMapper.selectById(taShareRecord.getPersonId());
         if (null != taPerson){
-            miniAppService.sendHelpMessage(taPerson,link,"拼团成功",taShareActivity.getActivityName(),LocalDateTime.now());
+            miniAppService.sendGroupMessage(taPerson,link,"拼团成功",taShareActivity.getActivityName(),LocalDateTime.now());
         }
         
         //批量发送给助力者
@@ -226,7 +226,7 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
         shareChildRecordList.forEach(e -> {
             TaPerson toTaPerson = taPersonMapper.selectById(e.getPersonId());
             if (null != toTaPerson){
-                miniAppService.sendHelpMessage(toTaPerson,link,"拼团成功",taShareActivity.getActivityName(),LocalDateTime.now());
+                miniAppService.sendGroupMessage(toTaPerson,link,"拼团成功",taShareActivity.getActivityName(),LocalDateTime.now());
             }
         });
     }