杰生

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

@@ -1,6 +1,7 @@
 package com.fjhx.utils.wrapperUtil;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -568,7 +569,7 @@ 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, value);
+        return in(ObjectUtil.isNotEmpty(value), sqlFieldName, Convert.toList(value));
     }
 
     /**
@@ -615,7 +616,7 @@ 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, value);
+        return notIn(ObjectUtil.isNotEmpty(value), sqlFieldName, Convert.toList(value));
     }
 
 

hx-service/storage/src/main/java/com/fjhx/u/service/impl/UUserServiceImpl.java

@@ -1,7 +1,5 @@
 package com.fjhx.u.service.impl;
 
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.entity.u.UUser;
@@ -50,10 +48,8 @@ public class UUserServiceImpl extends ServiceImpl<UUserMapper, UUser> implements
 
     @Override
     public List<Map<String, Object>> getList(Map<String, Object> condition) {
-        List<String> deptIdList = Convert.toList(String.class, condition.get("deptIdList"));
-
         IWrapper<UUser> wrapper = IWrapper.getWrapper(condition);
-        wrapper.in(ObjectUtil.isNotEmpty(deptIdList), "DepartmentID", deptIdList);
+        wrapper.in("DepartmentID", condition.get("deptIdList"));
         wrapper.select("id", "RealName", "DepartmentID");
         return listMaps(wrapper);
     }