|
@@ -2,6 +2,7 @@ package org.springblade.manager.service.impl;
|
|
|
|
|
|
import cn.hutool.core.date.StopWatch;
|
|
|
import cn.hutool.log.StaticLog;
|
|
|
+import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
@@ -309,6 +310,10 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
|
|
|
} else {
|
|
|
String dataVal = dataInfo2.getString(dataMap.get(k).get(0));
|
|
|
if (StringUtils.isNotEmpty(dataVal)) {
|
|
|
+ if (dataVal.contains("Ljava")){
|
|
|
+ Object o = dataInfo2.get(dataMap.get(k).get(0));
|
|
|
+ dataVal = JSON.toJSONString(o).replace("\"","");
|
|
|
+ }
|
|
|
dataMap2.put(k, dataVal + "_^_" + dataMap.get(k).get(0).split("__")[1]);
|
|
|
}
|
|
|
}
|