From 8341e9f11fbefc0925318e95e2b97d17133274ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E8=89=AF=28004796=29?= Date: Tue, 20 Feb 2024 10:33:12 +0800 Subject: [PATCH] 123333 --- .../com/ruoyi/cai/service/impl/UserBlacklistServiceImpl.java | 1 - .../main/java/com/ruoyi/cai/service/impl/UserServiceImpl.java | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserBlacklistServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserBlacklistServiceImpl.java index 3c5e0f76..62a6fd58 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserBlacklistServiceImpl.java +++ b/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; /** diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserServiceImpl.java index e41e703b..8ba30333 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserServiceImpl.java @@ -129,6 +129,9 @@ public class UserServiceImpl extends ServiceImpl implements Us query.setNoAuth(1); } } + if(query.getType() != null && query.getType() != 2){ + query.setCityId(null); + } return baseMapper.greetPageApp(page.build(),query); }