|
|
@@ -76,13 +76,18 @@ public class agents extends Controller {
|
|
|
RowsMap rowsMap = tradefieldidRows.toRowsMap("sys_enterpriseid");
|
|
|
for (Row agentRow : agentRows) {
|
|
|
if (rowsMap.containsKey(agentRow.getString("sys_enterpriseid"))) {
|
|
|
- agentRow.put("tradefield", rowsMap.get(agentRow.getString("sys_enterpriseid")).toJsonArray("tradefield"));
|
|
|
- agentRow.put("areaname", rowsMap.get(agentRow.getString("sys_enterpriseid")).toJsonArray("areaname"));
|
|
|
- agentRow.put("sa_saleareaid", rowsMap.get(agentRow.getString("sys_enterpriseid")).toJsonArray("sa_saleareaid"));
|
|
|
+ Rows rows = rowsMap.get(agentRow.getString("sys_enterpriseid"));
|
|
|
+ if (rows.isNotEmpty()) {
|
|
|
+ agentRow.put("tradefield", rows.toJsonArray("tradefield"));
|
|
|
+ agentRow.put("areaname", rows.toJsonArray("areaname"));
|
|
|
+ agentRow.put("sa_saleareaid", rows.get(0).getString("sa_saleareaid"));
|
|
|
+ agentRow.put("sa_saleareaids", rows.toJsonArray("sa_saleareaid"));
|
|
|
+ }
|
|
|
} else {
|
|
|
agentRow.put("tradefield", new JSONArray());
|
|
|
agentRow.put("areaname", new JSONArray());
|
|
|
- agentRow.put("areaname", new JSONArray());
|
|
|
+ agentRow.put("sa_saleareaid", "");
|
|
|
+ agentRow.put("sa_saleareaids", new JSONArray());
|
|
|
}
|
|
|
agentRow.put("hrs", getEnterpriseHrs(agentRow.getLong("sys_enterpriseid")));
|
|
|
|