维多利亚

hx-common/common-tool/src/main/java/com/fjhx/base/BaseService.java

@@ -19,7 +19,7 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 
 
-public interface BaseService<T  extends BaseIdEntity> extends IService<T> {
+public interface BaseService<T> extends IService<T> {
 
 
     default <V> AttributeAssignBuilder<T, V> attributeAssignBuilder(List<V> list) {

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

@@ -1,6 +1,7 @@
 package com.fjhx.utils;
 
-import com.fjhx.base.BaseIdEntity;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.convert.Convert;
 import com.fjhx.base.BaseService;
 import lombok.AllArgsConstructor;
 
@@ -12,7 +13,7 @@ import java.util.stream.Collectors;
 /**
  * 属性赋值构造器
  */
-public class AttributeAssignBuilder<T extends BaseIdEntity, V> {
+public class AttributeAssignBuilder<T, V> {
 
     /**
      * 服务
@@ -43,7 +44,7 @@ public class AttributeAssignBuilder<T extends BaseIdEntity, V> {
     /**
      * 初始化
      */
-    public static <T extends BaseIdEntity, V> AttributeAssignBuilder<T, V> init(BaseService<T> service, List<V> list) {
+    public static <T, V> AttributeAssignBuilder<T, V> init(BaseService<T> service, List<V> list) {
         return new AttributeAssignBuilder<>(service, list);
     }
 
@@ -71,7 +72,10 @@ public class AttributeAssignBuilder<T extends BaseIdEntity, V> {
         }
 
         // 查询Map<id,实体>
-        Map<Long, T> entityMap = service.listByIds(idSet).stream().collect(Collectors.toMap(BaseIdEntity::getId, item -> item));
+        Map<Long, T> entityMap = service.listByIds(idSet).stream().collect(Collectors.toMap(
+                item -> Convert.toLong(BeanUtil.beanToMap(item).get("id")),
+                item -> item
+        ));
         if (entityMap.size() == 0) {
             return;
         }