123333

ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserBlacklistServiceImpl.java

@@ -9,7 +9,6 @@ import com.ruoyi.cai.mapper.UserBlacklistMapper;
 import com.ruoyi.cai.service.UserBlacklistService;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.exception.ServiceException;
-import com.sun.deploy.util.BlackList;
 import org.springframework.stereotype.Service;
 
 /**

ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserServiceImpl.java

@@ -129,6 +129,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 query.setNoAuth(1);
             }
         }
+        if(query.getType() != null && query.getType() != 2){
+            query.setCityId(null);
+        }
         return baseMapper.greetPageApp(page.build(),query);
     }