|
@@ -1,5 +1,6 @@
|
|
|
package com.rongwei.bscommon.sys.utils;
|
|
|
|
|
|
+import cn.hutool.core.util.ObjectUtil;
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.rongwei.rwcommon.utils.JSONUtils;
|
|
@@ -557,11 +558,14 @@ public class XlsSheetUtil {
|
|
|
*/
|
|
|
JSONObject ct=dbObject.getJSONObject("ct");
|
|
|
if(ct.containsKey("s")){
|
|
|
- Object s=ct.get("s");
|
|
|
- if(s instanceof List && ((List) s).size()>0){
|
|
|
- JSONObject _s1=(JSONObject)((List) s).get(0);
|
|
|
- if(_s1.containsKey("v") && _s1.get("v")instanceof String){
|
|
|
- dbObject.put("v",_s1.get("v"));
|
|
|
+
|
|
|
+ JSONArray s = ct.getJSONArray("s");
|
|
|
+
|
|
|
+ if(ObjectUtil.isNotNull(s)) {
|
|
|
+ JSONObject s0 = s.getJSONObject(0);
|
|
|
+ s0.getString("v");
|
|
|
+ if(s0 != null) {
|
|
|
+ dbObject.put("v", s0.get("v"));
|
|
|
style.setWrapText(true);
|
|
|
}
|
|
|
}
|