diff --git a/src/main/java/com/spring/modules/sys/controller/SysMenuController.java b/src/main/java/com/spring/modules/sys/controller/SysMenuController.java index c65c07d4..12307de8 100644 --- a/src/main/java/com/spring/modules/sys/controller/SysMenuController.java +++ b/src/main/java/com/spring/modules/sys/controller/SysMenuController.java @@ -72,7 +72,6 @@ public class SysMenuController extends AbstractController { @RequiresPermissions("sys:menu:list") public List listLanguage(@PathVariable String language) { List menuList = sysMenuService.listLanguage(language); - ; for (SysMenuEntity sysMenuEntity : menuList) { System.out.println(sysMenuEntity.getParentId()); SysMenuEntity parentMenuEntity = sysMenuService.getByIdLanguage(sysMenuEntity.getParentId(), language); @@ -80,7 +79,6 @@ public class SysMenuController extends AbstractController { sysMenuEntity.setParentName(parentMenuEntity.getName()); } } - return menuList; } diff --git a/src/main/resources/mapper/base/PropertiesMapper.xml b/src/main/resources/mapper/base/PropertiesMapper.xml index 6d5ff4bd..8210985e 100644 --- a/src/main/resources/mapper/base/PropertiesMapper.xml +++ b/src/main/resources/mapper/base/PropertiesMapper.xml @@ -103,18 +103,18 @@ version FROM plm_properties_model_header - site = #{site} - - AND code_no like '%' + #{codeNo} +'%' + site = #{query.site} + + AND code_no like '%' + #{query.codeNo} +'%' - - AND code_desc like '%' + #{codeDesc} +'%' + + AND code_desc like '%' + #{query.codeDesc} +'%' - - AND active = #{active} + + AND active = #{query.active} - - and function_type = #{functionType} + + and function_type = #{query.functionType}