diff --git a/webapp/controller/MissionController.class.php b/webapp/controller/MissionController.class.php index 76d3286..aca9cb2 100644 --- a/webapp/controller/MissionController.class.php +++ b/webapp/controller/MissionController.class.php @@ -72,7 +72,8 @@ class MissionController extends BaseAuthedController { array_push($missionDtoList, $missionDto); } $this->_rspData(array( - 'mission_list' => $missionDtoList + 'mission_list1' => $missionDtoList, + 'mission_list2' => array() )); } diff --git a/webapp/models/Bag.php b/webapp/models/Bag.php index 5dd321a..bb5de32 100644 --- a/webapp/models/Bag.php +++ b/webapp/models/Bag.php @@ -59,7 +59,9 @@ class Bag extends BaseModel { 'account_id' => myself()->_getAccountId() ), function ($row) use(&$itemList) { - array_push($itemList, Bag::toDto($row)); + if ($row['item_num'] > 0) { + array_push($itemList, Bag::toDto($row)); + } } ); return $itemList; @@ -68,7 +70,7 @@ class Bag extends BaseModel { public static function getItemCount($itemId) { $itemDb = self::find($itemId); - return $itemDb ? $itemDb['item_count'] : 0; + return $itemDb ? $itemDb['item_num'] : 0; } public static function addItem($itemId, $itemNum)