From d9621b39834b46543498b2010781cea959f23b33 Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Mon, 13 Jan 2020 09:38:48 +0800
Subject: [PATCH] =?UTF-8?q?:robot:=20mapper.xml=E5=85=BC=E5=AE=B9eclipse?=
 =?UTF-8?q?=E3=80=81=E6=B2=A1=E8=A3=85=E6=8F=92=E4=BB=B6=E6=83=85=E5=86=B5?=
 =?UTF-8?q?=E7=9A=84=E5=86=99=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../springblade/system/mapper/DeptMapper.xml  |  8 +++----
 .../springblade/system/mapper/MenuMapper.xml  | 24 +++++++++----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml
index f751102f..9575e146 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml
@@ -63,11 +63,11 @@
         <if test="param2!=null">
             and dept.parent_id = #{param2}
         </if>
-        <if test="param.deptName!=null and param.deptName!=''">
-            and dept.dept_name like concat('%', #{param.deptName},'%')
+        <if test="param3.deptName!=null and param3.deptName!=''">
+            and dept.dept_name like concat('%', #{param3.deptName},'%')
         </if>
-        <if test="param.fullName!=null and param.fullName!=''">
-            and dept.full_name like concat('%', #{param.fullName},'%')
+        <if test="param3.fullName!=null and param3.fullName!=''">
+            and dept.full_name like concat('%', #{param3.fullName},'%')
         </if>
         ORDER BY dept.sort
     </select>
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.xml
index c1e12a59..f0a1e157 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.xml
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.xml
@@ -61,14 +61,14 @@
         <if test="param1!=null">
             and menu.parent_id = #{param1}
         </if>
-        <if test="param.name!=null and param.name!=''">
-            and menu.name like concat('%', #{param.name},'%')
+        <if test="param2.name!=null and param2.name!=''">
+            and menu.name like concat('%', #{param2.name},'%')
         </if>
-        <if test="param.code!=null and param.code!=''">
-            and menu.code like concat('%', #{param.code},'%')
+        <if test="param2.code!=null and param2.code!=''">
+            and menu.code like concat('%', #{param2.code},'%')
         </if>
-        <if test="param.alias!=null and param.alias!=''">
-            and menu.alias like concat('%', #{param.alias},'%')
+        <if test="param2.alias!=null and param2.alias!=''">
+            and menu.alias like concat('%', #{param2.alias},'%')
         </if>
         ORDER BY menu.sort
     </select>
@@ -90,14 +90,14 @@
         <if test="param1!=null">
             and menu.parent_id = #{param1}
         </if>
-        <if test="param.name!=null and param.name!=''">
-            and menu.name like concat('%', #{param.name},'%')
+        <if test="param2.name!=null and param2.name!=''">
+            and menu.name like concat('%', #{param2.name},'%')
         </if>
-        <if test="param.code!=null and param.code!=''">
-            and menu.code like concat('%', #{param.code},'%')
+        <if test="param2.code!=null and param2.code!=''">
+            and menu.code like concat('%', #{param2.code},'%')
         </if>
-        <if test="param.alias!=null and param.alias!=''">
-            and menu.alias like concat('%', #{param.alias},'%')
+        <if test="param2.alias!=null and param2.alias!=''">
+            and menu.alias like concat('%', #{param2.alias},'%')
         </if>
         ORDER BY menu.sort
     </select>