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

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

@@ -149,9 +149,13 @@ public class TaPersonController extends BaseController {
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
         TaPerson person = taPersons.get(0);
+        if (person.getPersonType().equals(CommConstant.PERSON_REALTY_CONSULTANT)){
+            return ResponseBean.error("您已经成为置业顾问",ResponseBean.ERROR_UNAVAILABLE);
+        }
         QueryWrapper<TaUser>queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("phone",person.getPhone());
         queryWrapper.eq("org_id",orgId);
+        queryWrapper.eq("status",CommConstant.STATUS_NORMAL);
         queryWrapper.eq("is_consultant",true);
         List<TaUser> users = taUserService.list(queryWrapper);
         if(users.size()>0){

src/main/resources/mapper/HelpActivityMapper.xml

@@ -61,6 +61,7 @@
                 a.city_id as cityId,
 				a.help_activity_id as activityId,
 				a.img as img,
+                a.banner_list_img as bannerListImg,
 				1 AS type
 			FROM
 				ta_help_activity a
@@ -82,6 +83,7 @@
                     s.city_id as cityId,
 					s.group_activity_id as activityId,
 					s.main_img as img,
+                    s.banner_list_img as bannerListImg,
 					2 AS type
 				FROM
 					ta_share_activity s