From 06e956a0543de4037b895151500cb672e9975b5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 1 Jul 2025 10:34:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nflg/wms/auth/controller/SsoServerController.java | 2 ++ .../java/com/nflg/wms/repository/mapper/RoleMapper.java | 3 --- .../src/main/resources/mapper/MenuMapper.xml | 4 ++-- .../src/main/resources/mapper/RoleMapper.xml | 6 +++--- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/nflg-wms-auth/src/main/java/com/nflg/wms/auth/controller/SsoServerController.java b/nflg-wms-auth/src/main/java/com/nflg/wms/auth/controller/SsoServerController.java index 13a00e88..493befdb 100644 --- a/nflg-wms-auth/src/main/java/com/nflg/wms/auth/controller/SsoServerController.java +++ b/nflg-wms-auth/src/main/java/com/nflg/wms/auth/controller/SsoServerController.java @@ -24,6 +24,7 @@ import jakarta.validation.constraints.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -33,6 +34,7 @@ import java.util.stream.Collectors; /** * Sa-Token-SSO Server端 */ +@Validated @RestController @RequestMapping("/sso") public class SsoServerController { diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/RoleMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/RoleMapper.java index 54faf856..a30ec8fd 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/RoleMapper.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/RoleMapper.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nflg.wms.common.pojo.qo.RoleSearchQO; -import com.nflg.wms.common.pojo.vo.ButtonVO; import com.nflg.wms.common.pojo.vo.MenuVO; import com.nflg.wms.common.pojo.vo.RoleVO; import com.nflg.wms.repository.entity.Role; @@ -24,6 +23,4 @@ public interface RoleMapper extends BaseMapper { IPage search(RoleSearchQO request, Page objectPage); List getMenusByRoleCodes(Long serviceId, Long userId); - - List getButtonsByMenuId(Long userId, Long menuId); } diff --git a/nflg-wms-repository/src/main/resources/mapper/MenuMapper.xml b/nflg-wms-repository/src/main/resources/mapper/MenuMapper.xml index d8e58759..541699a7 100644 --- a/nflg-wms-repository/src/main/resources/mapper/MenuMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/MenuMapper.xml @@ -6,9 +6,9 @@ SELECT DISTINCT mb.name, mb.code FROM role r INNER JOIN role_button_map rbm ON r.id = rbm.role_id - INNER JOIN admin_menu_button mb ON rbm.button_id = mb.id + INNER JOIN menu_button mb ON rbm.button_id = mb.id INNER JOIN user_role_map urm ON urm.role_id = r.id - WHERE mb.enable = 1 + WHERE mb.enable = TRUE AND mb.menu_id = #{menuId} AND urm.user_id = #{userId} diff --git a/nflg-wms-repository/src/main/resources/mapper/RoleMapper.xml b/nflg-wms-repository/src/main/resources/mapper/RoleMapper.xml index d9367261..f602bf3f 100644 --- a/nflg-wms-repository/src/main/resources/mapper/RoleMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/RoleMapper.xml @@ -16,10 +16,10 @@ SELECT DISTINCT m.id, m.name, m.url, m.component, m.parent_id AS "parentId", m.show FROM role r INNER JOIN role_menu_map rmm ON r.id = rmm.role_id - INNER JOIN admin_menu m ON rmm.menu_id = m.id + INNER JOIN menu m ON rmm.menu_id = m.id INNER JOIN user_role_map urm ON urm.role_id = r.id - WHERE m.enable = 1 - AND r.enable = 1 + WHERE m.enable = TRUE + AND r.enable = TRUE AND urm.user_id = #{userId} AND m.service_desc_id = #{serviceId}