Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -42,12 +42,12 @@ class TemplateLabelLogic extends BaseLogic
     public function saveLabel(){
     public function saveLabel(){
         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'];
-            $info = $this->model->read(['name'=>$this->param['name'],['template_id'=>$this->param['template_id']],'id'=>['!=',$id]],['id']);
+            $info = $this->model->read(['name'=>$this->param['name'],'template_id'=>$this->param['template_id'],'id'=>['!=',$id]],['id']);
             if($info === false){
             if($info === false){
                 $this->model->edit($this->param,['id'=>$id]);
                 $this->model->edit($this->param,['id'=>$id]);
             }
             }
         }else{
         }else{
-            $info = $this->model->read(['name'=>$this->param['name'],['template_id'=>$this->param['template_id']]],['id']);
+            $info = $this->model->read(['name'=>$this->param['name'],'template_id'=>$this->param['template_id']],['id']);
             if($info === false){
             if($info === false){
                 $this->param['manager_id'] = $this->manager['id'];
                 $this->param['manager_id'] = $this->manager['id'];
                 $id = $this->model->addReturnId($this->param);
                 $id = $this->model->addReturnId($this->param);

@@ -897,15 +897,7 @@ class BTemplateLogic extends BaseLogic
      * @time   :2023/12/20 10:26
      * @time   :2023/12/20 10:26
      */
      */
     public function getCategoryList($categoryModel,$status = 0,$filed = ['*']){
     public function getCategoryList($categoryModel,$status = 0,$filed = ['*']){
-        $data = array();
-        $list = $categoryModel->list(['pid'=>0,'status'=>$status],['sort','id'],$filed);
-        foreach ($list as $v){
-            $data[] = $v;
-            $son_list = $categoryModel->list(['pid'=>$v['id'],'status'=>$status],['sort','id'],$filed);
-            foreach ($son_list as $v1){
-                $data[] = $v1;
-            }
-        }
+        $data = $categoryModel->list(['status'=>$status],['sort','id'],$filed);
         return $this->success($data);
         return $this->success($data);
     }
     }
 
 
@@ -917,15 +909,7 @@ class BTemplateLogic extends BaseLogic
      * @time   :2023/12/20 10:26
      * @time   :2023/12/20 10:26
      */
      */
     public function getCategoryModuleList($categoryModel,$module_id,$status = 0,$filed = ['*']){
     public function getCategoryModuleList($categoryModel,$module_id,$status = 0,$filed = ['*']){
-        $data = array();
-        $list = $categoryModel->list(['pid'=>0, 'module_id'=>$module_id , 'status'=>$status],['sort','id'],$filed);
-        foreach ($list as $v){
-            $data[] = $v;
-            $son_list = $categoryModel->list(['pid'=>$v['id'],'module_id'=>$module_id,'status'=>$status],['sort','id'],$filed);
-            foreach ($son_list as $v1){
-                $data[] = $v1;
-            }
-        }
+        $data = $categoryModel->list(['module_id'=>$module_id , 'status'=>$status],['sort','id'],$filed);
         return $this->success($data);
         return $this->success($data);
     }
     }