|
|
@@ -54,7 +54,7 @@ class MasterWorkerMessageLogic extends BaseLogic
|
|
|
case 1:
|
|
|
$val['total'] = ServiceWorkLog::where(['master_worker_id'=>$userId,'show_type'=>YesNoEnum::NO])->count();
|
|
|
if($val['total']){
|
|
|
- $log = ServiceWorkLog::where(['master_worker_id'=>$userId,'show_type'=>YesNoEnum::NO])->order(['id'=>'desc'])->find()->toArray();
|
|
|
+ $log = ServiceWorkLog::where(['master_worker_id'=>$userId,'show_type'=>YesNoEnum::NO])->order(['id'=>'desc'])->find();
|
|
|
$log = self::formatMsg($log,1);
|
|
|
$val['title'] = $log['title'];
|
|
|
$val['date'] = $log['date'];
|
|
|
@@ -63,7 +63,7 @@ class MasterWorkerMessageLogic extends BaseLogic
|
|
|
case 3:
|
|
|
$val['total'] = MasterWorkerAccountLog::where(['worker_id'=>$userId,'show_type'=>YesNoEnum::NO ] )->count();
|
|
|
if($val['total']){
|
|
|
- $log = MasterWorkerAccountLog::where(['worker_id'=>$userId,'show_type'=>YesNoEnum::NO])->append(['action_text'])->order(['id'=>'desc'])->find()->toArray();
|
|
|
+ $log = MasterWorkerAccountLog::where(['worker_id'=>$userId,'show_type'=>YesNoEnum::NO])->append(['action_text'])->order(['id'=>'desc'])->find();
|
|
|
$log = self::formatMsg($log,3);
|
|
|
$val['title'] = $log['title'];
|
|
|
$val['date'] = $log['date'];
|
|
|
@@ -72,7 +72,7 @@ class MasterWorkerMessageLogic extends BaseLogic
|
|
|
case 4:
|
|
|
$val['total'] = Article::where(['is_show'=>YesNoEnum::YES])->count();
|
|
|
if($val['total']){
|
|
|
- $log = Article::where(['is_show'=>YesNoEnum::YES,'cid'=>3])->order(['id'=>'desc'])->find()->toArray();
|
|
|
+ $log = Article::where(['is_show'=>YesNoEnum::YES,'cid'=>3])->order(['id'=>'desc'])->find();
|
|
|
$log = self::formatMsg($log,4);
|
|
|
$val['title'] = $log['title'];
|
|
|
$val['date'] = $log['date'];
|