Selaa lähdekoodia

fix:"优化获取默认广告"

soobin 2 kuukautta sitten
vanhempi
commit
aae3697cf3

+ 1 - 1
src/main/java/com/szwl/controller/ADIndexController.java

@@ -97,7 +97,7 @@ public class ADIndexController {
         List<TAd> ads = aDService.list(query1);
         ArrayList<AdVo> list = new ArrayList<>();
         for (TAd ad : ads) {
-            if (adminId.equals(ad.getAdminId()) || ad.getAdminId() == null) {
+            if (adminId.equals(ad.getAdminId()) || StringUtils.isEmpty(ad.getAdminId())) {
                 AdVo adVo = new AdVo();
                 adVo.setAdType(String.valueOf(ad.getAdType()));
                 adVo.setLocationType(String.valueOf(ad.getLocationType()));

+ 1 - 1
src/main/java/com/szwl/controller/TAdminController.java

@@ -698,7 +698,7 @@ public class TAdminController {
         //验证用户名/手机/邮箱
         LambdaQueryWrapper<TAdmin> query = Wrappers.lambdaQuery();
         query.eq(TAdmin::getPassword, password);
-        query.and(wrapper -> wrapper.eq(TAdmin::getUsername, username).or().eq(TAdmin::getPhone, username).eq(TAdmin::getEmail, username));
+        query.and(wrapper -> wrapper.eq(TAdmin::getUsername, username).or().eq(TAdmin::getPhone, username).or().eq(TAdmin::getEmail, username));
         TAdmin tAdmin = Optional.ofNullable(tAdminService.getOnly(query))
                 .orElseThrow(() -> new BizException(ResponseCodesEnum.L0002));