修改记录盘方判断

application/index/validate/HouseValidate.php

@@ -19,22 +19,22 @@ class HouseValidate extends Validate
         'province'         => 'require|length:1,60',
         'city'             => 'require|length:1,60|in:上海市,杭州市',
         'disc'             => 'require|length:1,60',
-        'market_area'      => 'require|between:1,7',
-        'shop_area_start'  => 'require|between:1,7',
+        'market_area'      => 'require|between:1,9999999',
+        'shop_area_start'  => 'require|between:1,9999999',
         'rent_type'        => 'require|in:1,2,3',
         'rent_price'       => 'require',
         'industry_type'    => 'require',
         'shop_type'        => 'require|in:0,1',
         'shop_sign'        => 'require',
-        'management_fee'   => 'require|between:1,10',
-        'slotting_fee'     => 'require|between:1,10',
-        'residue_num'      => 'require|between:1,10',
-        'total'            => 'require|between:1,10',
+        'management_fee'   => 'require|between:1,9999999999',
+        'slotting_fee'     => 'require|between:1,9999999999',
+        'residue_num'      => 'require|between:1,9999999999',
+        'total'            => 'require|between:1,9999999999',
         'longitude'        => 'require|min:1',
         'latitude'         => 'require|min:1',
         'is_show'          => 'require|in:0,1',
-        'fee_rule'          => 'require|between:1,500',
-        'internal_item_advantage' => 'require|between:1,500',
+        'fee_rule'          => 'require',
+        'internal_item_advantage' => 'require',
     ];
     protected $message = [
         'internal_title.require'  => '对内商铺名为必填',

application/model/GHousesToAgents.php

@@ -84,18 +84,29 @@ class GHousesToAgents extends BaseModel
                 $records = new GOperatingRecords();
                 $name    = [];
                 foreach ($record_agents_id as $k2 => $v2) {
+                    $where_agent['houses_id'] = $houses_id;
+                    $where_agent['agents_id'] = $v2;
+                    $where_agent['is_del'] = 0;
+                    $is = $this->where($where_agent)->count();
+                    if ($is) {
+                        continue;
+                    }
                     $name[] = $agents->where('id', $v2)->value('name');
                 }
 
                 $num = $this->where('houses_id', $houses_id)->count();
 
                 if ($num > 0) {
-                    $str = '修改为：';
+                    if (count($name) > 0) {
+                        $str = '修改为：';
+                        $records->record('', 2, $str . implode(',', $name), $houses_id);
+                    }
                 } else {
                     $str = '新增为：';
+                    $records->record('', 2, $str . implode(',', $name), $houses_id);
                 }
 
-                $records->record('', 2, $str . implode(',', $name), $houses_id);
+
             }
 
             $res = $this->saveAll($agent_arr);