bug

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java

@@ -28,6 +28,7 @@ import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.node.ForestNodeMerger;
 import org.springblade.core.tool.node.TreeNode;
 import org.springblade.core.tool.support.Kv;
+import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.core.tool.utils.StringUtil;
@@ -95,6 +96,7 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
 
         //根据类型获取对应菜单
         List<Menu> allMenusList = baseMapper.allMenuBySysType(sysType);
+        List<Menu> newAllMenusList = BeanUtil.copyProperties(allMenusList, Menu.class);
 
         //只显示非隐藏按钮
         Iterator<Menu> iterator = allMenusList.iterator();
@@ -105,7 +107,7 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
                 continue;
             }
 
-            Menu menu = allMenusList.stream().filter(f -> obj.getParentId().equals(f.getId())).findAny().orElse(null);
+            Menu menu = newAllMenusList.stream().filter(f -> obj.getParentId().equals(f.getId())).findAny().orElse(null);
             if (ObjectUtil.isEmpty(menu)) {
                 //没有父级，删除当前子级
                 iterator.remove();

blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml

@@ -72,7 +72,7 @@
             and real_name like concat("%",#{user.realName},"%")
         </if>
         <if test="user.userType!=null and user.userType != ''">
-            and user_type = #{user.userType}
+            and user_type like concat("%",#{user.userType},"%")
         </if>
         <if test="deptIdList!=null and deptIdList.size>0">
             and id in (