Merge remote-tracking branch 'origin/1210-v3.0.2' into 1210-v3.0.2

application/index/controller/Finance.php

@@ -2858,7 +2858,7 @@ class Finance extends Basic
         $params["collecting_bill"] = json_decode($params["collecting_bill"], true);
 
         $remark       = isset($params["remark"]) ? $params["remark"] : "";
-        $transfer_img = isset($params["transfer_img"]) ? json_decode($params["transfer_img"] ,true): "";
+        $transfer_img = isset($params["transfer_img"]) ? $params["transfer_img"]: "";
         $income_time  = isset($params["income_time"]) ? $params["income_time"] : "";
         $pay_id       = isset($params["pay_id"]) ? $params["pay_id"] : 0;
         $source       = $params["source"] ? $params["source"] : 0;

application/index/service/HouseService.php

@@ -23,6 +23,7 @@ use app\model\GHousesToAgents;
 use app\model\GLandlordPhone;
 use app\model\GOperatingRecords;
 use app\task\controller\ResultsSummaryNewTask;
+use think\Log;
 
 class HouseService
 {
@@ -696,7 +697,7 @@ class HouseService
         $params__['level']=30;
         $result_zj = $this->agent->searchAgentsByKeyword("id,store_id,district_id,level", $params__);
 
-        if (($shop_agent_id == $agent_id)or($result_dz[0]['store_id'] == $agent_id)or($result_zj[0]['district_id'] == $agent_id)) {
+        if (($shop_agent_id == $agent_id)or($result_dz[0]['id'] == $agent_id)or($result_zj[0]['id'] == $agent_id)) {
             return 0;//可编辑
         }else{
             return 1;//不可编辑
@@ -727,6 +728,8 @@ class HouseService
         if($is_quanxian == 1){
             //是否存在独家方 查询
             $m_houses_to_agents_res = $this->getShopOnlyAgentId($shop_id);
+            $content = "独家方：{$m_houses_to_agents_res}商铺ID：{$shop_id}";
+            file_put_contents('/wwwdata/webroot/work/tl_test/runtime/log/201812/bug.log', $content."\r\n", FILE_APPEND);
             if($m_houses_to_agents_res){
                 //存在独家方则判断当前经纪人是否是该独家方的总监或者店长
                 return $this->isUserAgentBoss($m_houses_to_agents_res,$agent_id);