From f58d39ff5ea218ec52e24bb65fd55c25991cabce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Sun, 26 Jan 2025 22:40:03 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mobilebroken/auth/controller/AdminController.java | 4 ++-- .../common/pojo/request/ConfigUpdateRequest.java | 2 ++ .../common/pojo/request/SearchMenuButtonRequest.java | 2 ++ .../nflg/mobilebroken/repository/entity/AdminUser.java | 1 + .../repository/mapper/TBasePositionMapper.java | 10 ++++++++-- .../repository/service/impl/AdminUserServiceImpl.java | 2 +- .../service/impl/ParamConfigServiceImpl.java | 4 ++-- .../service/impl/WebComponentServiceImpl.java | 4 ++-- 8 files changed, 20 insertions(+), 9 deletions(-) diff --git a/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/AdminController.java b/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/AdminController.java index 63254e7e..d788e344 100644 --- a/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/AdminController.java +++ b/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/AdminController.java @@ -36,9 +36,9 @@ public class AdminController { public ApiResult login(String userName, String password) { AdminUser user=adminUserService.getUser(userName,password); VUtils.trueThrow(Objects.isNull(user)).throwMessage(STATE.PassportErr,"用户名或密码错误"); - VUtils.trueThrow(user.getState()==-1).throwMessage(STATE.PassportErr,"用户被冻结，请联系管理员"); + VUtils.trueThrow(!user.getEnable()).throwMessage(STATE.PassportErr, "用户被禁用，请联系管理员"); SaTokenAdminUtil.login(user.getId(), SaLoginConfig - .setExtra("name", user.getName())); + .setExtra("name", user.getUserName())); return ApiResult.success(SaTokenAdminUtil.getTokenInfo()); } diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ConfigUpdateRequest.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ConfigUpdateRequest.java index 561d8fd7..0d597219 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ConfigUpdateRequest.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ConfigUpdateRequest.java @@ -1,7 +1,9 @@ package com.nflg.mobilebroken.common.pojo.request; import lombok.Data; +import lombok.EqualsAndHashCode; +@EqualsAndHashCode(callSuper = false) @Data public class ConfigUpdateRequest extends ConfigAddRequest { diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/SearchMenuButtonRequest.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/SearchMenuButtonRequest.java index 89642f1b..2ec6ea5d 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/SearchMenuButtonRequest.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/SearchMenuButtonRequest.java @@ -1,7 +1,9 @@ package com.nflg.mobilebroken.common.pojo.request; import lombok.Data; +import lombok.EqualsAndHashCode; +@EqualsAndHashCode(callSuper = false) @Data public class SearchMenuButtonRequest extends PageRequest { diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminUser.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminUser.java index 201618a2..74cd632b 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminUser.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminUser.java @@ -8,6 +8,7 @@ import lombok.Setter; import lombok.experimental.Accessors; import java.io.Serializable; +import java.time.LocalDateTime; /** *

diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/TBasePositionMapper.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/TBasePositionMapper.java index 9aa20317..0b396eec 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/TBasePositionMapper.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/TBasePositionMapper.java @@ -1,6 +1,12 @@ package com.nflg.mobilebroken.repository.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.nflg.mobilebroken.common.pojo.query.PageBaseQuery; import com.nflg.mobilebroken.repository.entity.TBasePosition; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -13,7 +19,7 @@ import com.nflg.mobilebroken.repository.entity.TBasePosition; public interface TBasePositionMapper extends BaseMapper { - Page getList(@Param("page")Page page,@Param("query") PageBaseQuery query); + Page getList(@Param("page") Page page, @Param("query") PageBaseQuery query); - void delByIds(@Param("ids")List ids); + void delByIds(@Param("ids") List ids); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminUserServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminUserServiceImpl.java index 8e1189b6..966c97c3 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminUserServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminUserServiceImpl.java @@ -25,7 +25,7 @@ public class AdminUserServiceImpl extends ServiceImpl