Merge branch 'main' of http://git.njrzwl.cn:3000/wangmingchuan/yanzong

app/admin/controller/Store.php

@@ -184,18 +184,38 @@ class Store extends Controller
      */
     public function auth(int $storeId): Json
     {
-        SyncTask::where('store_id', $storeId)->delete();
         $platformList = $this->request->param('platformList');
+        $currItems = SyncTask::where('store_id', $storeId)->select()->toArray();
+        if ($currItems) {
+            $delIds = [];
+            foreach ($currItems as $item) {
+                if (!in_array($item['channel'], $platformList)) {
+                    $delIds[] = $item['id'];
+                }
+            }
+            unset($item);
+            //删除
+            if ($delIds) {
+                SyncTask::whereIn('id', $delIds)->delete();
+            }
+        }
+        $curr_channels = array_column($currItems, "channel");
         $inData = [];
-        foreach ($platformList as $value) {
+        foreach ($platformList as $platform) {
+            if (in_array($platform, $curr_channels)) {
+                continue;
+            }
             $inData[] = [
                 'store_id' => $storeId,
-                'channel' => $value,
+                'channel' => $platform,
                 'create_time' => time(),
             ];
         }
-        $model = new SyncTask;
-        $model->addAll($inData);
+        if ($inData) {
+            $model = new SyncTask;
+            $model->addAll($inData);
+            
+        }
         
         return $this->renderSuccess('操作成功');
     }

app/api/controller/Article.php

@@ -61,7 +61,7 @@ class Article extends Controller
      */
     public function add(): Json
     {
-        if (UserService::isStore()) {
+        if (!UserService::isStore()) {
             throwError("无权限", 403);
         }
         $title = $this->request->post('title');
@@ -97,7 +97,7 @@ class Article extends Controller
      */
     public function edit(): Json
     {
-        if (UserService::isStore()) {
+        if (!UserService::isStore()) {
             throwError("无权限", 403);
         }
         $articleId = intval($this->request->post('article_id'));
@@ -140,7 +140,7 @@ class Article extends Controller
      */
     public function delete(): Json
     {
-        if (UserService::isStore()) {
+        if (!UserService::isStore()) {
             throwError("无权限", 403);
         }
         $articleId = intval($this->request->post('article_id'));
@@ -163,7 +163,7 @@ class Article extends Controller
      */
     public function addCategory(): Json
     {
-        if (UserService::isStore()) {
+        if (!UserService::isStore()) {
             throwError("无权限", 403);
         }
         $name = $this->request->post('name');
@@ -191,7 +191,7 @@ class Article extends Controller
      */
     public function editCategory(): Json
     {
-        if (UserService::isStore()) {
+        if (!UserService::isStore()) {
             throwError("无权限", 403);
         }
         $categoryId = intval($this->request->post('category_id'));
@@ -226,7 +226,7 @@ class Article extends Controller
      */
     public function delCategory(): Json
     {
-        if (UserService::isStore()) {
+        if (!UserService::isStore()) {
             throwError("无权限", 403);
         }
         $categoryId = intval($this->request->post('category_id'));
@@ -250,7 +250,7 @@ class Article extends Controller
      */
     public function categoryList(): Json
     {
-        if (UserService::isStore()) {
+        if (!UserService::isStore()) {
             throwError("无权限", 403);
         }
         $model = new \app\api\model\article\Category;