gx

@@ -74,9 +74,9 @@ class OptimizeController extends BaseController
         $item['product_num'] = $data['product'] ?? 0;
         $item['product_num'] = $data['product'] ?? 0;
         $item['keyword_num'] = $item['key'] ?? 0;
         $item['keyword_num'] = $item['key'] ?? 0;
         $item['autologin_code'] = getAutoLoginCode($item['id']);
         $item['autologin_code'] = getAutoLoginCode($item['id']);
-        $item['article_num'] = ($data['blog'] ?? 0) + ($data['news'] ?? 0);
-        $item['task_finish_num'] = Task::getNumByProjectId($item['id'], Task::STATUS_DOWN);
-        $item['task_pending_num'] = Task::getNumByProjectId($item['id'], [Task::STATUS_DONGING, Task::STATUS_WAIT]);
+//        $item['article_num'] = ($data['blog'] ?? 0) + ($data['news'] ?? 0);
+//        $item['task_finish_num'] = Task::getNumByProjectId($item['id'], Task::STATUS_DOWN);
+//        $item['task_pending_num'] = Task::getNumByProjectId($item['id'], [Task::STATUS_DONGING, Task::STATUS_WAIT]);
         return $item;
         return $item;
     }
     }
     /**
     /**

@@ -23,7 +23,7 @@ class UserController extends BaseController
     public function lists(UserModel $userModel){
     public function lists(UserModel $userModel){
         //TODO::搜索参数统一处理
         //TODO::搜索参数统一处理
         $this->map['project_id'] = $this->user['project_id'];
         $this->map['project_id'] = $this->user['project_id'];
-        $this->map['role'] = ['!=',0];
+        $this->map['role_id'] = ['!=',0];
         $lists = $userModel->lists($this->map,$this->page,$this->row,$this->order,['id','name','mobile','created_at','wechat','status']);
         $lists = $userModel->lists($this->map,$this->page,$this->row,$this->order,['id','name','mobile','created_at','wechat','status']);
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }

@@ -91,8 +91,8 @@ class ProjectLogic extends BaseLogic
      * @time   :2023/8/30 11:57
      * @time   :2023/8/30 11:57
      */
      */
     public function projectSave(){
     public function projectSave(){
-//        DB::beginTransaction();
-//        try {
+        DB::beginTransaction();
+        try {
             if($this->param['type'] == Project::TYPE_SEVEN){
             if($this->param['type'] == Project::TYPE_SEVEN){
                 //错误单直接返回,单独处理
                 //错误单直接返回,单独处理
                 $this->setTypeSevenEdit($this->param);
                 $this->setTypeSevenEdit($this->param);
@@ -110,11 +110,11 @@ class ProjectLogic extends BaseLogic
                 //保存售后信息
                 //保存售后信息
                 $this->saveProjectAfter($this->param['project_after']);
                 $this->saveProjectAfter($this->param['project_after']);
             }
             }
-//            DB::commit();
-//        }catch (\Exception $e){
-//            DB::rollBack();
-//            $this->fail('error');
-//        }
+            DB::commit();
+        }catch (\Exception $e){
+            DB::rollBack();
+            $this->fail('error');
+        }
         return $this->success();
         return $this->success();
     }
     }