|
@@ -59,7 +59,9 @@ public class FormulaOptionServiceImpl extends ServiceImpl<FormulaOptionMapper, F
|
|
|
if (jo.containsKey(wbc.getInitTableName())) {
|
|
if (jo.containsKey(wbc.getInitTableName())) {
|
|
|
JSONObject tableJson = jo.getJSONObject(wbc.getInitTableName());
|
|
JSONObject tableJson = jo.getJSONObject(wbc.getInitTableName());
|
|
|
if (key.contains("__")) {
|
|
if (key.contains("__")) {
|
|
|
- String cellKey = pkeyId + "@" + key;
|
|
|
|
|
|
|
+ //(pkeyId + "@" + key)匹配不上,不知道什么含义,先注释掉
|
|
|
|
|
+// String cellKey = pkeyId + "@" + key;
|
|
|
|
|
+ String cellKey=key.split("__")[0];
|
|
|
if (tableJson.containsKey(cellKey)) {
|
|
if (tableJson.containsKey(cellKey)) {
|
|
|
JSONObject excel = tableJson.getJSONObject(cellKey);
|
|
JSONObject excel = tableJson.getJSONObject(cellKey);
|
|
|
if (excel.containsKey("TF")) {
|
|
if (excel.containsKey("TF")) {
|