后台：媒资注入和播控管理使用播单方式问题修复

SooonerHotel/App/Lib/Action/Inject/InjectAction.class.php

@@ -69,15 +69,24 @@ class InjectAction extends CommonAction{
 			$info =$model->where("id = $id")->find();
             $this->info = $info;
 		}
-        $media_lists = $mediaModel->join(" A join sh_sp B on A.site_id = B.site_id ")->field("concat(A.id,'_',A.code) id,A.title,group_concat(B.id) sp_ids")->group(" A.id ")->select();
+        $media_lists = $mediaModel->join(" A join sh_sp B on A.site_id = B.site_id ")
+            ->field("concat(A.id,'_',A.code) id,A.title,group_concat(B.id) sp_ids")->group(" A.id ")->select();
         if($userInfo['sp_ids']&&$userInfo['grade']>=3){
             $sp_lists = $spModel->field("id,`name`")->where("`status`=0 and id in(".$userInfo['sp_ids'].")")->select();
-            $hotel_lists = $hotelModel->field("id,`name`,sp_id")->where("`status`=0 and sp_id in(".$userInfo['sp_ids'].")")->select();
-            $play_lists = $spPlaylistModel->join(" A join sh_sp_playlist_media_map B on A.id = B.playlist_id ")->field("A.id,A.`name`,A.sp_id,group_concat(B.media_id) media_ids")->where("A.sp_id in(".$userInfo['sp_ids'].") and A.`status` = 0")->group("A.id")->select();
+            $hotel_lists = $hotelModel->field("id,`name`,sp_id")
+                ->where("`status`=0 and sp_id in(".$userInfo['sp_ids'].")")->select();
+            $play_lists = $spPlaylistModel->join(" A join sh_sp_playlist_media_map B on A.id = B.playlist_id ")
+                ->join(" join sh_media_wasu C on B.media_id=C.id ")
+                ->field("A.id,A.`name`,A.sp_id,group_concat(concat(B.media_id,'_',C.code)) media_ids")
+                ->where("A.sp_id in(".$userInfo['sp_ids'].") and A.`status` = 0")
+                ->group("A.id")->select();
         }else{
             $sp_lists = $spModel->field("id,`name`")->where("`status`=0")->select();
             $hotel_lists = $hotelModel->field("id,`name`,sp_id")->where("`status`=0")->select();
-            $play_lists = $spPlaylistModel->join(" A join sh_sp_playlist_media_map B on A.id = B.playlist_id ")->field("A.id,A.`name`,A.sp_id,group_concat(B.media_id) media_ids")->where("A.`status` = 0")->group("A.id")->select();
+            $play_lists = $spPlaylistModel->join(" A join sh_sp_playlist_media_map B on A.id = B.playlist_id ")
+                ->join(" join sh_media_wasu C on B.media_id=C.id ")
+                ->field("A.id,A.`name`,A.sp_id,group_concat(concat(B.media_id,'_',C.code)) media_ids")
+                ->where("A.`status` = 0")->group("A.id")->select();
         }
         
         $this->hotel_lists = $hotel_lists;

SooonerHotel/App/Lib/Action/Playctrl/PlayCtrlAction.class.php

@@ -76,12 +76,19 @@ class PlayCtrlAction extends CommonAction{
         $media_lists = $mediaModel->join(" A join sh_sp B on A.site_id = B.site_id ")->field("concat(A.id,'_',A.code) id,A.title,group_concat(B.id) sp_ids")->group(" A.id ")->select();
         if($userInfo['sp_ids']&&$userInfo['grade']>=3){
             $sp_lists = $spModel->field("id,`name`")->where("`status`=0 and id in(".$userInfo['sp_ids'].")")->select();
-            $hotel_lists = $hotelModel->field("id,`name`,sp_id,region_id")->where("`status`=0 and sp_id in(".$userInfo['sp_ids'].")")->select();
-            $play_lists = $spPlaylistModel->join(" A join sh_sp_playlist_media_map B on A.id = B.playlist_id ")->field("A.id,A.`name`,A.sp_id,group_concat(B.media_id) media_ids")->where("A.sp_id in(".$userInfo['sp_ids'].")")->group("A.id")->select();
+            $hotel_lists = $hotelModel->field("id,`name`,sp_id,region_id")
+                ->where("`status`=0 and sp_id in(".$userInfo['sp_ids'].")")->select();
+            $play_lists = $spPlaylistModel->join(" A join sh_sp_playlist_media_map B on A.id = B.playlist_id ")
+                ->join(" join sh_media_wasu C on B.media_id=C.id ")
+                ->field("A.id,A.`name`,A.sp_id,group_concat(concat(B.media_id,'_',C.code)) media_ids")
+                ->where("A.sp_id in(".$userInfo['sp_ids'].")")
+                ->group("A.id")->select();
         }else{
             $sp_lists = $spModel->field("id,`name`")->where("`status`=0")->select();
             $hotel_lists = $hotelModel->field("id,`name`,sp_id,region_id")->where("`status`=0")->select();
-            $play_lists = $spPlaylistModel->join(" A join sh_sp_playlist_media_map B on A.id = B.playlist_id ")->field("A.id,A.`name`,A.sp_id,group_concat(B.media_id) media_ids")->group("A.id")->select();
+            $play_lists = $spPlaylistModel->join(" A join sh_sp_playlist_media_map B on A.id = B.playlist_id ")
+                ->join(" join sh_media_wasu C on B.media_id=C.id ")
+                ->field("A.id,A.`name`,A.sp_id,group_concat(concat(B.media_id,'_',C.code)) media_ids")->group("A.id")->select();
         }
         
         $region_lists = $regionModel->where("`level` < 4 and pid < 999999")->select();