|
@@ -446,6 +446,11 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
|
|
|
//列下标
|
|
|
String colIndex = cellData.getString("c");
|
|
|
JSONObject titleInfo = prjTitle.getJSONObject(colIndex);
|
|
|
+
|
|
|
+ if(ObjectUtil.isNull(titleInfo)) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+
|
|
|
if("-1".equals(titleInfo.getString("parent"))) {
|
|
|
row.put(titleInfo.getString("value"), m1);
|
|
|
continue;
|
|
@@ -612,6 +617,11 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
|
|
|
|
|
|
prjTitle.put(colIndex, titleValue);
|
|
|
} else {
|
|
|
+ JSONObject colInfo = prjTitle.getJSONObject(colIndex);
|
|
|
+ if(ObjectUtil.isNull(colInfo)) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+
|
|
|
//单元格数据处理
|
|
|
prjTitle.getJSONObject(colIndex).put("value", m1);
|
|
|
}
|