|
|
@@ -296,6 +296,7 @@ public class workorder extends Controller {
|
|
|
rowsTwoLevel.add(rowOneLevel);
|
|
|
}
|
|
|
}
|
|
|
+ RowsMap rowsOneLevelMap = rowsOneLevel.toRowsMap("parentid");
|
|
|
RowsMap rowsTwoLevelMap = rowsTwoLevel.toRowsMap("parentid");
|
|
|
// 附件
|
|
|
ArrayList<Long> ids = rowsOneLevel.toArrayList("sa_workorder_nodeid", new ArrayList<>());
|
|
|
@@ -303,8 +304,8 @@ public class workorder extends Controller {
|
|
|
RowsMap attRowsMap = getAttachmentUrl("sa_workorder_node", ids);
|
|
|
|
|
|
RowsMap rowsMapdetails = queryWorkOrderNodedetails(sa_workorderid, row.getLong("sys_enterpriseid"),attRowsMap);
|
|
|
- if (!rowsOneLevel.isEmpty()) {
|
|
|
- for (Row rowOneLevel : rowsOneLevel) {
|
|
|
+ if (rowsOneLevelMap.containsKey("0")) {
|
|
|
+ for (Row rowOneLevel : rowsOneLevelMap.get("0")) {
|
|
|
long sa_workorder_template_worksid = 0;
|
|
|
if (rowOneLevel.getJSONObject("workpresetjson") == null || rowOneLevel.getJSONObject("workpresetjson").isEmpty()) {
|
|
|
if (rowsOneLevelMapWorkpreset.containsKey(rowOneLevel.getString("rownum"))) {
|