xuhuisheng#34 限制只把当前表单填写的数据设置到流程变量里，这样可以避免之前表单设置的变量被覆盖，覆盖时因为读取不到类型，导致…

…转换失败
hit2075 · Dec 24, 2013 · 0b976a2 · 0b976a2
1 parent de8327c
commit 0b976a2
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/src/main/java/com/mossle/form/web/form/FormAction.java b/src/main/java/com/mossle/form/web/form/FormAction.java
@@ -247,7 +247,7 @@ public String startProcessInstance() throws Exception {
             if ("userPicker".equals(formType)) {
                 processParameters.put(key,
                         new ArrayList(Arrays.asList(value.split(","))));
-            } else {
+            } else if (formType != null) {
                 processParameters.put(key, value);
             }
         }
@@ -283,7 +283,7 @@ private String getFormType(Map<String, String> formTypeMap, String name) {
         if (formTypeMap.containsKey(name)) {
             return formTypeMap.get(name);
         } else {
-            return "textfield";
+            return null;
         }
     }
 
@@ -353,12 +353,14 @@ public String completeTask() throws Exception {
             Map map = jsonMapper.fromJson(content, Map.class);
             logger.info("map : {}", map);
 
-            List<Map> list = (List<Map>) map.get("fields");
-            logger.info("list : {}", list);
+            if (map != null) {
+                List<Map> list = (List<Map>) map.get("fields");
+                logger.info("list : {}", list);
 
-            for (Map item : list) {
-                formTypeMap.put((String) item.get("name"),
-                        (String) item.get("type"));
+                for (Map item : list) {
+                    formTypeMap.put((String) item.get("name"),
+                            (String) item.get("type"));
+                }
             }
         }
 
@@ -376,7 +378,7 @@ public String completeTask() throws Exception {
             if ("userPicker".equals(formType)) {
                 processParameters.put(key,
                         new ArrayList(Arrays.asList(value.split(","))));
-            } else {
+            } else if (formType != null) {
                 processParameters.put(key, value);
             }
         }