|
|
@@ -605,8 +605,8 @@ public class RMScontroller extends BaseRESTfulController {
|
|
|
){
|
|
|
throw new Exception("单元格数据异常,请检查模板或数据是否正确!");
|
|
|
}
|
|
|
- set.add(item.get("NC主键").toString()+item.get("类型").toString());
|
|
|
- map.put(item.get("NC主键").toString()+item.get("类型").toString(),item);
|
|
|
+ set.add(item.get("NC主键").toString()+"-"+item.get("类型").toString());
|
|
|
+ map.put(item.get("NC主键").toString()+"-"+item.get("类型").toString(),item);
|
|
|
}
|
|
|
//去重
|
|
|
String[] setList = set.toArray(new String[0]);
|