杰生

bladex/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DictBizMapper.xml

@@ -54,8 +54,15 @@
           and is_deleted = 0
     </select>
 
-    <select id="tree" resultMap="treeNodeResultMap">
-        select id, parent_id, dict_value as title, id as "value", id as "key"
+    <select id="tree" resultType="org.springblade.system.vo.DictBizVO">
+        select id,
+               parent_id,
+               dict_value as title,
+               id         as "value",
+               id         as "key",
+               code,
+               dict_key,
+               dict_value
         from blade_dict_biz
         where is_deleted = 0
     </select>

hx-common/common-tool/src/main/java/com/fjhx/utils/wrapperUtil/IWrapper.java

@@ -577,7 +577,13 @@ public class IWrapper<T> extends AbstractWrapper<T, String, IWrapper<T>> impleme
 
     @Override
     public IWrapper<T> in(String sqlFieldName, Object... value) {
-        return in(ObjectUtil.isNotEmpty(value), sqlFieldName, Convert.toList(value));
+        if (value.length == 0) {
+            return this;
+        }
+        if (value[0] instanceof Collection) {
+            return in(ObjectUtil.isNotEmpty(value[0]), sqlFieldName, Convert.toList(value[0]));
+        }
+        return in(sqlFieldName, Convert.toList(value));
     }
 
     /**
@@ -624,7 +630,13 @@ public class IWrapper<T> extends AbstractWrapper<T, String, IWrapper<T>> impleme
 
     @Override
     public IWrapper<T> notIn(String sqlFieldName, Object... value) {
-        return notIn(ObjectUtil.isNotEmpty(value), sqlFieldName, Convert.toList(value));
+        if (value.length == 0) {
+            return this;
+        }
+        if (value[0] instanceof Collection) {
+            return notIn(ObjectUtil.isNotEmpty(value[0]), sqlFieldName, Convert.toList(value[0]));
+        }
+        return notIn(sqlFieldName, Convert.toList(value));
     }