|
@@ -262,7 +262,13 @@ public class GoodsMgrController extends BaseApiController {
|
|
|
Object value = entry.getValue();
|
|
|
Map<String, Object> mapObj = new HashMap<String, Object>();
|
|
|
mapObj.put("name", key);
|
|
|
- mapObj.put("value", value);
|
|
|
+ if (value instanceof List<?>) {
|
|
|
+ mapObj.put("value", value);
|
|
|
+ } else {
|
|
|
+ List<Object> list = new ArrayList<>();
|
|
|
+ list.add(value + "");
|
|
|
+ mapObj.put("value", list);
|
|
|
+ }
|
|
|
mapList.add(mapObj);
|
|
|
}
|
|
|
return JSONArray.toJSONString(mapList);
|
|
@@ -278,12 +284,12 @@ public class GoodsMgrController extends BaseApiController {
|
|
|
System.out.println("isb == " + isb);
|
|
|
List<Object> list = new ArrayList<>();
|
|
|
if (isa) {
|
|
|
- list.addAll((List<Object>) a);
|
|
|
+ list.addAll((List<?>) a);
|
|
|
} else {
|
|
|
list.add(a+"");
|
|
|
}
|
|
|
if (isb) {
|
|
|
- list.addAll((List<Object>) b);
|
|
|
+ list.addAll((List<?>) b);
|
|
|
} else {
|
|
|
list.add(b+"");
|
|
|
}
|