Commit 65edb9f4 by shiwenbo

兼容处理没有库存日志的情况

parent b1defed9
...@@ -215,14 +215,16 @@ public class InventoryServiceImpl implements InventoryService { ...@@ -215,14 +215,16 @@ public class InventoryServiceImpl implements InventoryService {
for(KObject i : inventory) { for(KObject i : inventory) {
businessObjectId.add(i.getUuid("id").toString()); businessObjectId.add(i.getUuid("id").toString());
} }
List<KObject> logList = inventoryDao.queryLog(businessObjectId); if(businessObjectId.size() > 0) {
for(KObject log : logList) { List<KObject> logList = inventoryDao.queryLog(businessObjectId);
KObject operator = staffService.getById(log.getUuid("staffId")); for(KObject log : logList) {
InventoryLog item = new InventoryLog(); KObject operator = staffService.getById(log.getUuid("staffId"));
item.setTime(format.format(log.getDate("time"))); InventoryLog item = new InventoryLog();
item.setOperator(operator.getString("name")); item.setTime(format.format(log.getDate("time")));
item.setContent(log.getString("logContent")); item.setOperator(operator.getString("name"));
result.add(item); item.setContent(log.getString("logContent"));
result.add(item);
}
} }
return result; return result;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment