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

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

@@ -166,6 +166,9 @@ public class TaPersonController extends BaseController {
             QueryWrapper<TaChannel> queryWrapper = new QueryWrapper();
             queryWrapper.eq("channel_code",channelCode);
             TaChannel channel = taChannelService.getOne(queryWrapper);
+            if (null == channel){
+                return ResponseBean.error("渠道码不存在",ResponseBean.ERROR_UNAVAILABLE);
+            }
             QueryWrapper<TaChannelPerson>taChannelPersonQueryWrapper = new QueryWrapper<>();
             taChannelPersonQueryWrapper.eq("person_id",person.getPersonId());
             taChannelPersonQueryWrapper.eq("channel_id",channel.getChannelId());

src/main/resources/mapper/HelpInitiateRecordMapper.xml

@@ -73,15 +73,23 @@
     b.phone as phone
     from ta_help_initiate_record b
     where b.help_activity_id =  #{helpActivityId}
-    <if test="condition == 'helpSucceed'">
-        and b.status = 1
-    </if>
-    <if test="condition == 'helpUnfinished'">
-        and b.status = 2
-    </if>
-    <if test="tel != null and tel != ''">
-        and  b.phone like concat('%',#{tel},'%')
-    </if>
+        <if test="condition == 'helpSucceed'">
+            AND b.verification !='null'
+            AND b.verification !=''
+        </if>
+        <if test="condition == 'helpUnderway'">
+            and (b.verification is null OR b.verification = '')
+            AND b.`status` = 1
+        </if>
+
+        <if test="condition == 'helpUnfinished'">
+            and (b.verification is null
+            OR b.verification = '')
+            AND b.`status` =  2
+        </if>
+        <if test="tel != null and tel != ''">
+            and  b.phone like concat('%',#{tel},'%')
+        </if>
      order by b.create_date desc
      limit #{pageCode}, #{pageSize}
     </select>