gx

@@ -34,8 +34,9 @@ class OaNoticeController extends BaseController
         if(!empty($lists) && !empty($lists['list'])){
         if(!empty($lists) && !empty($lists['list'])){
             $projectModel = new Project();
             $projectModel = new Project();
             foreach ($lists['list'] as $k => $v){
             foreach ($lists['list'] as $k => $v){
+                $project_str = trim($v['project_str'],',');
                 if(strtolower($v['project_str']) != 'all'){
                 if(strtolower($v['project_str']) != 'all'){
-                    $v['project_title'] = $projectModel->formatQuery(['id'=>['in',explode(',',$v['project_str'])]])->pluck('title')->toArray();
+                    $v['project_title'] = $projectModel->formatQuery(['id'=>['in',explode(',',$project_str)]])->pluck('title')->toArray();
                 }else{
                 }else{
                     $v['project_title'] = '所有';
                     $v['project_title'] = '所有';
                 }
                 }

@@ -338,7 +338,8 @@ class ComController extends BaseController
         $this->map['start_time'] = ['<=',date('Y-m-d H:i:s')];
         $this->map['start_time'] = ['<=',date('Y-m-d H:i:s')];
         $this->map['end_time'] = ['>=',date('Y-m-d H:i:s')];
         $this->map['end_time'] = ['>=',date('Y-m-d H:i:s')];
         $this->map['status'] = 0;
         $this->map['status'] = 0;
-        $lists = $oaNoticeModel->list($this->map);
+        $lists = $oaNoticeModel->where($this->map)->where('project_str','like','%,'.$this->user['project_id'].',%')
+                ->orWhere('project_str', 'all')->select(['*'])->orderBy($this->order,'desc')->paginate($this->row, ['*'], 'page', $this->page);
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }
 
 

@@ -12,6 +12,7 @@ namespace App\Http\Logic\Aside\Com;
 use App\Http\Logic\Aside\BaseLogic;
 use App\Http\Logic\Aside\BaseLogic;
 use App\Models\Manage\Manage;
 use App\Models\Manage\Manage;
 use App\Models\OaNotice\OaNotice;
 use App\Models\OaNotice\OaNotice;
+use App\Models\Project\Project;
 
 
 class OaNoticeLogic extends BaseLogic
 class OaNoticeLogic extends BaseLogic
 {
 {
@@ -34,6 +35,10 @@ class OaNoticeLogic extends BaseLogic
      */
      */
     public function saveOaNotice(){
     public function saveOaNotice(){
         $this->param['operator_id'] = $this->manager['id'];
         $this->param['operator_id'] = $this->manager['id'];
+        $project_str = trim($this->param['project_str'],',');
+        if($project_str != 'all'){
+            $this->param['project_str'] = ','.$project_str.',';
+        }
         if(isset($this->param['id']) && !empty($this->param['id'])){
         if(isset($this->param['id']) && !empty($this->param['id'])){
             $id = $this->param['id'];
             $id = $this->param['id'];
             $this->model->edit($this->param,['id'=>$id]);
             $this->model->edit($this->param,['id'=>$id]);
@@ -68,6 +73,13 @@ class OaNoticeLogic extends BaseLogic
         if($info == false){
         if($info == false){
             $this->fail('当前数据不存在或已被删除');
             $this->fail('当前数据不存在或已被删除');
         }
         }
+        $info['project_str'] = trim($info['project_str'],',');
+        if(strtolower($info['project_str']) != 'all'){
+            $projectModel = new Project();
+            $info['project_title'] = $projectModel->formatQuery(['id'=>['in',explode(',',$info['project_str'])]])->pluck('title')->toArray();
+        }else{
+            $info['project_title'] = '所有';
+        }
         $info['operator_name'] = (new Manage())->getName($info['operator_id']);
         $info['operator_name'] = (new Manage())->getName($info['operator_id']);
         return $this->success($info);
         return $this->success($info);
     }
     }