Merge branch '1030-v2.9.6' of https://gitee.com/zwyjjc/tl_estate into 1030-v2.9.6

application/index/service/BrokerService.php

@@ -105,7 +105,7 @@ class BrokerService
             $old_site_id = $m_district->getDistrictKeyById('site_id', ['id'=>$agent_data['district_id']]);
             $new_site_id = $m_district->getDistrictKeyById('site_id', ['id'=>$data['district_id']]);
 
-            if ($old_site_id != $new_site_id) {
+            if ($old_site_id != $new_site_id && empty($data['confirm_old'])) {
                 $result['msg'] = '编辑部门，导致所属城市不一致';
                 return $result;
             }

public/resource/js/getCollection.js

@@ -413,6 +413,7 @@ define(['doT', 'text!temp/get_collection_template_tpl.html', 'css!style/home.css
 			params.district_id = $("select[name='district_id'] option:selected").val();
 			params.pay_type = $("select[name='maintable_shop_type_2'] option:selected").val();
 			params.type = $("select[name='maintable_shop_type_1'] option:selected").val();
+			params.agent_name = $("#submit_name").val();
 			params.pageNo = follow.pageNo;
 			params.pageSize = follow.pageSize;