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

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

@@ -251,8 +251,11 @@ public class HelpActivityController extends BaseController {
             helpInitiateRecordQuery.eq("help_activity_id",helpActivityId);
                 List<HelpInitiateRecord> list= helpInitiateRecordMapper.selectList(helpInitiateRecordQuery);
                 for (HelpInitiateRecord helpInitiateRecord:list){
-                    helpInitiateRecord.setStatus(2);
-                    helpInitiateRecordMapper.updateById(helpInitiateRecord);
+                    // 助力成功的不更新。
+                    if (!helpInitiateRecord.getStatus().equals(0)) {
+                        helpInitiateRecord.setStatus(2);
+                        helpInitiateRecordMapper.updateById(helpInitiateRecord);
+                    }
                 }
         }
         Boolean isA = taHelpActivityService.updateById(helpActivity);

src/main/resources/mapper/Activity.xml

@@ -3,11 +3,26 @@
 <mapper namespace="com.huiju.estateagents.activity.mapper.ActivityMapper">
 
     <select id="getActivityList" resultType="com.huiju.estateagents.activity.entity.Activity">
-        SELECT dynamic_id as id,img_url as main_img,title,start_date as start_date,enlist_end as end_date,weight,activity_status,'dynamic' as type FROM ta_building_dynamic WHERE org_id = #{orgId}  and `status` = #{status} and city_id = #{cityId}
+        SELECT dynamic_id as id,img_url as main_img,title,start_date as start_date,enlist_end as end_date,weight,activity_status,'dynamic' as type
+        FROM ta_building_dynamic
+        WHERE org_id = #{orgId}  and `status` = #{status}
+        <if test="cityId != null and cityId != ''">
+          and city_id = #{cityId}
+        </if>
         UNION  all
-        SELECT group_activity_id as id,main_img,activity_name as title,start_time as start_date,end_time as end_date,weight,activity_status,'group' as type from ta_share_activity WHERE org_id = #{orgId} and `status` = #{status} and city_id = #{cityId}
+        SELECT group_activity_id as id,main_img,activity_name as title,start_time as start_date,end_time as end_date,weight,activity_status,'group' as type
+        from ta_share_activity
+        WHERE org_id = #{orgId} and `status` = #{status}
+        <if test="cityId != null and cityId != ''">
+            and city_id = #{cityId}
+        </if>
         UNION  all
-        SELECT help_activity_id as id,img as main_img,title,start_date,end_date,weight,activity_status,'help' as type from ta_help_activity WHERE org_id = #{orgId} and `status` = #{status} and city_id = #{cityId}
+        SELECT help_activity_id as id,img as main_img,title,start_date,end_date,weight,activity_status,'help' as type
+        from ta_help_activity
+        WHERE org_id = #{orgId} and `status` = #{status}
+        <if test="cityId != null and cityId != ''">
+            and city_id = #{cityId}
+        </if>
         ORDER BY weight desc,activity_status,start_date
     </select>
 </mapper>

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -247,7 +247,7 @@ FROM
         if(a.sex = 1, '男',if(a.sex = 2, '女', '未知')) as sex,
         c.nickname as recommend,
         c.phone as recommendTel,
-        if(a.verify_status = 0, '未通过', if(a.verify_status = 1, '已通过', if(a.verify_status = 2, '已驳回', ''))) as verifyStatusName
+        if(a.verify_status = 0, '待审核', if(a.verify_status = 1, '已通过', if(a.verify_status = 2, '未通过', ''))) as verifyStatusName
         FROM
         ta_recommend_customer a
         LEFT JOIN ta_person c on a.recommend_person = c.person_id