|  | @@ -32,6 +32,20 @@ class Party extends Backend
 | 
	
		
			
				|  |  |          $this->view->assign("isCloseList", $this->model->getIsCloseList());
 | 
	
		
			
				|  |  |          $this->view->assign("isScreenList", $this->model->getIsScreenList());
 | 
	
		
			
				|  |  |          $this->view->assign("onModelList", $this->model->getOnModelList());
 | 
	
		
			
				|  |  | +        $partyTypeModel = new \app\admin\model\party\Type();
 | 
	
		
			
				|  |  | +        $partyTypeData = $partyTypeModel->select();
 | 
	
		
			
				|  |  | +        $partyTypeList = [];
 | 
	
		
			
				|  |  | +        if (!empty($partyTypeData)) {
 | 
	
		
			
				|  |  | +            foreach ($partyTypeData as $key => $value) {
 | 
	
		
			
				|  |  | +                $partyTypeList[$key] = [
 | 
	
		
			
				|  |  | +                    'id' => $value['name'],
 | 
	
		
			
				|  |  | +                    'name' => $value['name'],
 | 
	
		
			
				|  |  | +                ];
 | 
	
		
			
				|  |  | +            }
 | 
	
		
			
				|  |  | +        }
 | 
	
		
			
				|  |  | +        $this->assignconfig([
 | 
	
		
			
				|  |  | +            'partyTypeList' => $partyTypeList,
 | 
	
		
			
				|  |  | +        ]);
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      public function import()
 | 
	
	
		
			
				|  | @@ -61,17 +75,24 @@ class Party extends Backend
 | 
	
		
			
				|  |  |                  return $this->selectpage();
 | 
	
		
			
				|  |  |              }
 | 
	
		
			
				|  |  |              list($where, $sort, $order, $offset, $limit) = $this->buildparams();
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -            $list = $this->model
 | 
	
		
			
				|  |  | -                    ->with(['user'])
 | 
	
		
			
				|  |  | +            $party = 'party';
 | 
	
		
			
				|  |  | +            $user = 'user';
 | 
	
		
			
				|  |  | +            $partyType = 'party_type';
 | 
	
		
			
				|  |  | +            $field = $party.'.id,'.$party.'.room_type,party_id,party_hot,party_name,party_logo,party_notice,party_notice_detail,naming,
 | 
	
		
			
				|  |  | +            '.$party.'.is_online,'.$party.'.status,is_close,is_recommend,party_type,platRate,guilderRate,party_pass,is_screen,on_model,
 | 
	
		
			
				|  |  | +            background,'.$party.'.updatetime,'.$party.'.createtime,'.$user.'.u_id as `'.$user.'.u_id`,'.
 | 
	
		
			
				|  |  | +            $user.'.nickname as `'.$user.'.nickname`,'.$partyType.'.name as `'.$partyType.'.name`';
 | 
	
		
			
				|  |  | +            $list = $this->model->alias($party)->field($field)
 | 
	
		
			
				|  |  | +                    ->join($user, $user.'.id = '.$party.'.user_id', 'LEFT')
 | 
	
		
			
				|  |  | +                    ->join($partyType, $partyType.'.id = '.$party.'.party_type', 'LEFT')
 | 
	
		
			
				|  |  |                      ->where($where)
 | 
	
		
			
				|  |  |                      ->order($sort, $order)
 | 
	
		
			
				|  |  |                      ->paginate($limit);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -            foreach ($list as $row) {
 | 
	
		
			
				|  |  | +            /*foreach ($list as $row) {
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |                  $row->getRelation('user')->visible(['u_id', 'nickname']);
 | 
	
		
			
				|  |  | -            }
 | 
	
		
			
				|  |  | +            }*/
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |              $result = array("total" => $list->total(), "rows" => $list->items());
 | 
	
		
			
				|  |  |  
 |