diff --git a/application/api/controller/Message.php b/application/api/controller/Message.php index 1a362f69c37a00146d8414f54e98f4d26c05ec81..c1343a6eb307aaadcb95e348d65718661b968136 100755 --- a/application/api/controller/Message.php +++ b/application/api/controller/Message.php @@ -49,7 +49,6 @@ class Message extends Common // 参数 $params = $this->data_post; $params['user'] = $this->user; - $params['user_type'] = 'user'; // 消息更新未已读 MessageService::MessageRead($params); diff --git a/application/api/controller/Userintegral.php b/application/api/controller/Userintegral.php index 68f95a35201d9a6503d410be8bcea4fb3c7340b8..c95b3cee2570f3a6a05c2011c425b8fd1e0db77b 100755 --- a/application/api/controller/Userintegral.php +++ b/application/api/controller/Userintegral.php @@ -50,7 +50,6 @@ class UserIntegral extends Common // 参数 $params = $this->data_post; $params['user'] = $this->user; - $params['user_type'] = 'user'; // 分页 $number = 10; diff --git a/application/index/controller/Message.php b/application/index/controller/Message.php index 65ec66ce6ce5d6f844891e235c58392b9060b0f6..d9936998da6bbbeba6c694691288802ae93dbad7 100755 --- a/application/index/controller/Message.php +++ b/application/index/controller/Message.php @@ -50,7 +50,6 @@ class Message extends Common // 参数 $params = input(); $params['user'] = $this->user; - $params['user_type'] = 'user'; // 消息更新未已读 MessageService::MessageRead($params); diff --git a/application/index/controller/Userintegral.php b/application/index/controller/Userintegral.php index 49b060889a6121fbf2fc669820f1195da76d2368..1e4808e4f55baa935a1ce1867c5d8840e7a35ace 100755 --- a/application/index/controller/Userintegral.php +++ b/application/index/controller/Userintegral.php @@ -50,7 +50,6 @@ class UserIntegral extends Common // 参数 $params = input(); $params['user'] = $this->user; - $params['user_type'] = 'user'; // 分页 $number = 10; diff --git a/application/service/IntegralService.php b/application/service/IntegralService.php index 56bf23d78d0341116d1226e4d7a92fb7543cd357..18618548ba3e2e1a880ca45d5499eb521b231b14 100755 --- a/application/service/IntegralService.php +++ b/application/service/IntegralService.php @@ -69,20 +69,13 @@ class IntegralService */ public static function UserIntegralLogListWhere($params = []) { - // 用户类型 - $user_type = isset($params['user_type']) ? $params['user_type'] : 'user'; - // 条件初始化 $where = []; - // 用户类型 - if(isset($params['user_type']) && $params['user_type'] == 'user') + // 用户id + if(!empty($params['user'])) { - // 用户id - if(!empty($params['user'])) - { - $where[] = ['user_id', '=', $params['user']['id']]; - } + $where[] = ['user_id', '=', $params['user']['id']]; } if(!empty($params['keywords'])) diff --git a/application/service/MessageService.php b/application/service/MessageService.php index 8a639565af2e438379b0406d256541c856449e64..349c5226b4d3cb1ece3cbf8e3e1e40e6d39e2577 100755 --- a/application/service/MessageService.php +++ b/application/service/MessageService.php @@ -62,9 +62,6 @@ class MessageService */ public static function MessageListWhere($params = []) { - // 用户类型 - $user_type = isset($params['user_type']) ? $params['user_type'] : 'user'; - // 条件初始化 $where = [ ['is_delete_time', '=', 0], @@ -76,14 +73,10 @@ class MessageService $where[] = ['id', '=', $params['id']]; } - // 用户类型 - if(isset($params['user_type']) && $params['user_type'] == 'user') + // 用户id + if(!empty($params['user'])) { - // 用户id - if(!empty($params['user'])) - { - $where[] = ['user_id', '=', $params['user']['id']]; - } + $where[] = ['user_id', '=', $params['user']['id']]; } // 关键字