|
|
|
@ -549,15 +549,11 @@ public class RetailAppServiceImp implements RetailAppService {
|
|
|
|
|
JSONObject result = PageListUtils.buildPageListResult(logs);
|
|
|
|
|
if (appQueryBean.getPage() == 1) {
|
|
|
|
|
if (!logs.isEmpty() && logs.size() > 0) {
|
|
|
|
|
JSONObject clearingDetail = clearingDetailMapper.findByDetailId(logs.get(0).getIntValue("clearing_order"));
|
|
|
|
|
if (clearingDetail!=null){
|
|
|
|
|
JSONObject clearingLog = clearingLogMapper.findById(clearingDetail.getIntValue("clearing_id"));
|
|
|
|
|
JSONObject clearingLog = clearingLogMapper.findById(logs.get(0).getIntValue("clearing_id"));
|
|
|
|
|
if(clearingLog.getBoolean("editable")){
|
|
|
|
|
logger.info("###editable:"+clearingLog.getBoolean("editable"));
|
|
|
|
|
result.put("padding", true);
|
|
|
|
|
logs.get(0).put("padding",true);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return result;
|
|
|
|
|