1. admin-web 接入菜单

2. system 迁移菜单接口

common/common-framework/src/main/java/cn/iocoder/common/framework/mybatis/QueryWrapperX.java

@@ -1,8 +1,11 @@
 package cn.iocoder.common.framework.mybatis;
 
+import cn.iocoder.common.framework.util.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.util.StringUtils;
 
+import java.util.Collection;
+
 /**
  * 拓展 MyBatis Plus QueryWrapper 类，主要增加如下功能：
  *
@@ -19,6 +22,20 @@ public class QueryWrapperX<T> extends QueryWrapper<T> {
         return this;
     }
 
+    public QueryWrapperX<T> inIfPresent(String column, Collection<?> values) {
+        if (!CollectionUtil.isEmpty(values)) {
+            return (QueryWrapperX<T>) super.in(column, values);
+        }
+        return this;
+    }
+
+    public QueryWrapperX<T> inIfPresent(String column, Object... values) {
+        if (!CollectionUtil.isEmpty(values)) {
+            return (QueryWrapperX<T>) super.in(column, values);
+        }
+        return this;
+    }
+
     public QueryWrapperX<T> eqIfPresent(String column, Object val) {
         if (val != null) {
             return (QueryWrapperX<T>) super.eq(column, val);