|
@@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollUtil;
|
|
|
import cn.hutool.core.map.MapUtil;
|
|
|
import cn.hutool.core.util.ReflectUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
-import cn.hutool.json.JSONUtil;
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
|
@@ -400,11 +399,12 @@ public class AbstractAdmBaseServiceImpl<T> implements IAdmBaseService<T> {
|
|
|
}
|
|
|
// 调用中台查询
|
|
|
DmpResult<JSONArray> dmpResult = rwdClient.queryObject(context, para);
|
|
|
- JSONArray data = dmpResult.getData();
|
|
|
- List<T> admVOs = new ArrayList<>();
|
|
|
- if(CollUtil.isNotEmpty(data)){
|
|
|
- admVOs = JSONUtil.toList(data.toJSONString(),clazz);
|
|
|
- }
|
|
|
+ List<T> admVOs = AdmEntityTransferUtil.toAdmMultiEntity(dmpResult.getData(), null, clazz);
|
|
|
+// JSONArray data = dmpResult.getData();
|
|
|
+// List<T> admVOs = new ArrayList<>();
|
|
|
+// if(CollUtil.isNotEmpty(data)){
|
|
|
+// admVOs = data.toJavaList(clazz);
|
|
|
+// }
|
|
|
// 设置返回值
|
|
|
AdmResponse response = AdmResponse.success(admVOs);
|
|
|
Long total = dmpResult.getCount() == null ? null : dmpResult.getCount().longValue();
|