Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev

2024-07-02 14:42:58 +08:00 · 2024-07-02 14:42:58 +08:00 · 9bd450ce1b
commit 9bd450ce1b
parent faa314d14a 13d4ac1fad
1 changed files with 4 additions and 1 deletions
--- a/app/common/lists/user/UserShipLists.php
+++ b/app/common/lists/user/UserShipLists.php
@ -42,7 +42,10 @@ class UserShipLists extends BaseAdminDataLists
        if(!$this->request->__get('id')){
            $arr[]=['id'=>0,'title'=>'一般用户','limit'=>0];
        }
-        $this->searchWhere[]=['id','<>',4];
+        $type_id=$this->request->get('type_id',0);
+        if($type_id!=4){
+            $this->searchWhere[]=['id','<>',4];
+        }
        $lists = UserShip::where($this->searchWhere)
            ->limit($this->limitOffset, $this->limitLength)
            ->field($field)