Merge remote-tracking branch 'origin/master'

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>

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>