合并

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

@@ -183,7 +183,7 @@ public class TaChannelController extends BaseController {
     @RequestMapping(value="/admin/channel/broker",method= RequestMethod.GET)
     public  ResponseBean channelBrokerList(@RequestParam(value="name",required = false) String name,
                                            @RequestParam(value="phone",required = false) String phone,
-                                           @RequestParam(value="phone",required = false) Integer channelId,
+                                           @RequestParam(value="channelId",required = false) Integer channelId,
                                            @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                            HttpServletRequest request){

src/main/resources/mapper/TaPersonMapper.xml

@@ -515,7 +515,6 @@ FROM
         <if test="phone !=null and phone !=''">
             and rc.phone = #{phone}
         </if>
-            and p.person_type = 'estate agent'
             and p.org_id= #{orgid}
             and tch.channel_id = #{channelId}
         </where>