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

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

@@ -285,7 +285,7 @@ public class TaShareRecordController extends BaseController {
      * @return
      */
     @RequestMapping(value="/wx/taShareRecord",method= RequestMethod.GET)
-    public ResponseBean wxShareRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNumber,
+    public ResponseBean wxShareRecordList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                                  @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                                  HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -341,19 +341,19 @@ FROM
             SELECT
               count( 1 )
             FROM
-              ta_recommend_customer tarc
-            LEFT JOIN ta_person tp ON tarc.recommend_person = tp.person_id
+              ta_person tp
             WHERE
-              tarc.recommend_person = a.person_id and ifnull(tp.person_type, '') = 'customer'
+              tp.recommend_agent = a.person_id
         ) AS agentCount,
         (
             SELECT
               count( 1 )
             FROM
               ta_recommend_customer tarc
-            LEFT JOIN ta_person tp ON tarc.recommend_person = tp.person_id
             WHERE
-              tarc.recommend_person = a.person_id and ifnull(tp.person_type, '') in ('channel agent', 'estate agent')
+              tarc.recommend_person = a.person_id
+              and tarc.status = 1
+              and tarc.org_id = #{orgId}
         ) AS recommedCount
         FROM
         ta_person a