作者 lyh

gx

@@ -176,7 +176,7 @@ class MonthCountLogic extends BaseLogic @@ -176,7 +176,7 @@ class MonthCountLogic extends BaseLogic
176 $count = new Count(); 176 $count = new Count();
177 $startTime = date("Y-m-d", strtotime("-9 months", mktime(0, 0, 0))); 177 $startTime = date("Y-m-d", strtotime("-9 months", mktime(0, 0, 0)));
178 $ensTime = date('Y-m-d',time()); 178 $ensTime = date('Y-m-d',time());
179 - $lists = $count->list(['date'=>['between',[$startTime,$ensTime]],'project_id'=>$this->user['project_id']]); 179 + $lists = $count->list(['date'=>['between',[$startTime,$ensTime]],'project_id'=>$this->user['project_id']],'id',['*'],'asc');
180 $groupedData = []; 180 $groupedData = [];
181 foreach ($lists as $k=>$v){ 181 foreach ($lists as $k=>$v){
182 $month = date('Y-m', strtotime($v['date'])); 182 $month = date('Y-m', strtotime($v['date']));
@@ -184,7 +184,7 @@ class MonthCountLogic extends BaseLogic @@ -184,7 +184,7 @@ class MonthCountLogic extends BaseLogic
184 $groupedData[$month] = []; 184 $groupedData[$month] = [];
185 } 185 }
186 if(empty($v['country'])){ 186 if(empty($v['country'])){
187 - $v['country'] = ['中国'=>0]; 187 + $v['country'] = [];
188 } 188 }
189 $groupedData[$month][] = $v; 189 $groupedData[$month][] = $v;
190 } 190 }