From 7e739059ba4e935473394e70f4e997fc04ff24e6 Mon Sep 17 00:00:00 2001
From: yangduo <yangduo@kingsome.cn>
Date: Tue, 11 Feb 2025 15:01:20 +0800
Subject: [PATCH] fix

---
 webapp/classes/AddReward.php               | 4 +---
 webapp/controller/RoleController.class.php | 2 --
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/webapp/classes/AddReward.php b/webapp/classes/AddReward.php
index d45e094..25a9f51 100644
--- a/webapp/classes/AddReward.php
+++ b/webapp/classes/AddReward.php
@@ -474,12 +474,10 @@ class AddReward {
                     if ($row['active_time'] < time() + $time * 3600) {
                         $nowTime = time() + $time * 3600;
                     }
+                    $status = 1;
                 }
                 if ($t == 0) {
                     $status = $this->getStatus($item_id, $status,$accountid);
-                    if ($status == 2 && $nowTime > time()) {
-                        $status = 1;
-                    }
                 } else if ($t == 1){
                     $status = 0;
                     $this->updateStatus($item_id, $accountid);
diff --git a/webapp/controller/RoleController.class.php b/webapp/controller/RoleController.class.php
index 8a2012f..0e1901a 100644
--- a/webapp/controller/RoleController.class.php
+++ b/webapp/controller/RoleController.class.php
@@ -2129,8 +2129,6 @@ class RoleController
 
     public function getFightEquip()
     {
-        phpcommon\sendError(ERR_USER_BASE + 1, 'id无效');
-        return;
         $account_id = $_REQUEST['account_id'];
         //登录校验
         $login = loginVerify($account_id, $_REQUEST['session_id']);