Merge remote-tracking branch 'origin/master' into akun

@@ -25,7 +25,6 @@ class ATemplateController extends BaseController
      */
      */
     public function lists(ATemplateLogic $aTemplateLogic){
     public function lists(ATemplateLogic $aTemplateLogic){
         $filed = ['id','name','image','url','status','sort','deleted_status','test_model','created_at','project_id'];
         $filed = ['id','name','image','url','status','sort','deleted_status','test_model','created_at','project_id'];
-        $this->map['project_id'] = 0;
         $lists = $aTemplateLogic->aTemplateList($this->map,$this->page,$this->row,$this->order,$filed);
         $lists = $aTemplateLogic->aTemplateList($this->map,$this->page,$this->row,$this->order,$filed);
         if(!empty($lists) && !empty($lists['list'])){
         if(!empty($lists) && !empty($lists['list'])){
             foreach ($lists['list'] as $k => $v){
             foreach ($lists['list'] as $k => $v){

@@ -28,6 +28,7 @@ class ATemplateLogic extends BaseLogic
      * @time   :2023/6/28 17:03
      * @time   :2023/6/28 17:03
      */
      */
     public function aTemplateList($map,$page,$row,$order = ['created_at'],$filed = ['*']){
     public function aTemplateList($map,$page,$row,$order = ['created_at'],$filed = ['*']){
+        $map['project_id'] = 0;
         $map['deleted_status'] = 0;
         $map['deleted_status'] = 0;
         $map['status'] = 0;
         $map['status'] = 0;
         $lists = $this->model->lists($map,$page,$row,$order,$filed);
         $lists = $this->model->lists($map,$page,$row,$order,$filed);