From 1117bae80877ce80ce1b8f626b0b1bea0db8bba6 Mon Sep 17 00:00:00 2001
From: zelian_wu <zelian.wu@xujiesoft.com>
Date: Tue, 20 Feb 2024 15:29:13 +0800
Subject: [PATCH] =?UTF-8?q?2024-02-20=20=E6=B5=8B=E8=AF=95=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E4=BA=A7=E5=93=81=E7=BB=93=E6=9E=84,=E5=B7=A5?=
 =?UTF-8?q?=E8=89=BA=E8=B7=AF=E7=BA=BF,=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/controller/SysMenuController.java      |  2 --
 .../resources/mapper/base/PropertiesMapper.xml | 18 +++++++++---------
 2 files changed, 9 insertions(+), 11 deletions(-)

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<SysMenuEntity> listLanguage(@PathVariable String language) {
         List<SysMenuEntity> 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
         <where>
-            site = #{site}
-            <if test="codeNo != null and codeNo != ''">
-                AND code_no like '%' + #{codeNo} +'%'
+            site = #{query.site}
+            <if test="query.codeNo != null and query.codeNo != ''">
+                AND code_no like '%' + #{query.codeNo} +'%'
             </if>
-            <if test="codeDesc != null and codeDesc != ''">
-                AND code_desc like '%' + #{codeDesc} +'%'
+            <if test="query.codeDesc != null and query.codeDesc != ''">
+                AND code_desc like '%' + #{query.codeDesc} +'%'
             </if>
-            <if test="active != null and active != ''">
-                AND active = #{active}
+            <if test="query.active != null and query.active != ''">
+                AND active = #{query.active}
             </if>
-            <if test="functionType != null and functionType != ''">
-                       and function_type = #{functionType}
+            <if test="query.functionType != null and query.functionType != ''">
+                       and function_type = #{query.functionType}
             </if>
 
         </where>