Browse Source

修改一个删除action bar的bug

DESKTOP-C21C1Q8\tangs 6 years ago
parent
commit
aa2484193f

+ 1 - 4
app/Http/Controllers/ActionBarController.php

@@ -3,11 +3,8 @@
 namespace App\Http\Controllers;
 
 use App\Models;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\Request;
-use Mockery\Exception;
 use Illuminate\Support\Facades\Log;
-use PhpParser\Node\Expr\AssignOp\Mod;
 
 class ActionBarController extends Controller
 {
@@ -65,7 +62,7 @@ class ActionBarController extends Controller
         $params["uid"] = $uid;
 
         $bar = new Models\ActionBar();
-        $result = $bar->LoadActionBar($params);
+        $result = $bar->ListActionBar($params);
         return "success";
     }
 }

+ 0 - 82
app/Http/Controllers/UserController.php

@@ -10,86 +10,4 @@ use Illuminate\Http\Request;
 class UserController extends Controller
 {
 
-    /**
-     * Add a user into system if the user is not exist.
-     *
-     * @param Request $request
-     * @return string
-     */
-    public function AddUser(Request $request)
-    {
-        $user = new Models\User();
-
-        $username = $request->input("username");
-        if ($username == "") {
-            return "invalid username";
-        }
-        $nickname = $request->input("nickname");
-        if ($nickname == "") {
-            $nickname = $username;
-        }
-        $password = $request->input("password");
-        if ($password == "") {
-            return "invalid password";
-        }
-
-        // Check to see if the user exists
-        $data = Models\User::where("username", $username)->first();
-        if ($data) {
-            return "username have already exist";
-        }
-
-        $user->username = $username;
-        $user->nickname = $nickname;
-        $user->password = $password;
-        $user->save();
-        return "success";
-    }
-
-    /**
-     * * Del user from system.
-     *
-     * @param Request $request
-     * @return string
-     */
-    public function DelUser(Request $request)
-    {
-        $user = new Models\User();
-        $uid = $request->input("uid");
-        if ($uid == "") {
-            return "invalid uid";
-        }
-
-        // todo. 不管是否有数据,这里都会返回true.
-        $data = Models\User::where("id", 111)
-            ->where("is_del", false)->update(['is_del' => false]);
-        if ($data) {
-            return "invalid user";
-        } else {
-            return "success";
-        }
-    }
-
-
-    /**
-     * Modify user information.
-     *
-     * @param string $uid
-     * @return mixed
-     */
-    public function ModifyUser(string $uid)
-    {
-        return true;
-    }
-
-    /**
-     * Judge the user if exist in system.
-     *
-     * @param string $uid
-     * @return string
-     */
-    public function IsExist(string $uid)
-    {
-        return "";
-    }
 }

+ 5 - 2
app/Models/ActionBar.php

@@ -190,11 +190,14 @@ class UserActionBar extends Model
             ->where("bar_id", $barId)
             ->where("is_del", false)
             ->first();
-        if (!$data){
+        if (!$data) {
             return "nothing to remove";
         }
         $this->is_del = true;
-        $this->save();
+        $this->where("user_id", $uid)
+            ->where("bar_id", $barId)
+            ->where("is_del", false)
+            ->update(["is_del" => true]);
         return "success";
     }