|
|
@ -1614,9 +1614,11 @@ public class SignFpqsServiceImpl extends MpBaseServiceImpl<SignRecordInvoiceDao, |
|
|
|
String company = (String)pramsMap.get("company"); |
|
|
|
String company = (String)pramsMap.get("company"); |
|
|
|
String menuId = (String)pramsMap.get("menuId"); |
|
|
|
String menuId = (String)pramsMap.get("menuId"); |
|
|
|
JSONObject json = tabulateRedisService.getTabulateMenu(company, menuId); |
|
|
|
JSONObject json = tabulateRedisService.getTabulateMenu(company, menuId); |
|
|
|
|
|
|
|
log.info("菜单列表 {}",json); |
|
|
|
|
|
|
|
|
|
|
|
List<Tax> list = (List<Tax>)pramsMap.get("orgList"); |
|
|
|
List<Tax> list = (List<Tax>)pramsMap.get("orgList"); |
|
|
|
if (list == null || list.size() == 0) { |
|
|
|
if (list == null || list.size() == 0) { |
|
|
|
|
|
|
|
log.info("orglist为空直接返回空结果集"); |
|
|
|
json.put("datalist", new ArrayList<QsjgQueryVO>()); |
|
|
|
json.put("datalist", new ArrayList<QsjgQueryVO>()); |
|
|
|
json.put("total", 0); |
|
|
|
json.put("total", 0); |
|
|
|
return super.responseResult(json); |
|
|
|
return super.responseResult(json); |
|
|
@ -1629,6 +1631,7 @@ public class SignFpqsServiceImpl extends MpBaseServiceImpl<SignRecordInvoiceDao, |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
pageList = signInvoiceSmService.selectQsfpList(pramsMap); |
|
|
|
pageList = signInvoiceSmService.selectQsfpList(pramsMap); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
log.info("pageList {}",pageList); |
|
|
|
PageInfo<TDxInvoice> pageInfo = new PageInfo<>(pageList); |
|
|
|
PageInfo<TDxInvoice> pageInfo = new PageInfo<>(pageList); |
|
|
|
List<TDxInvoice> resultList = pageInfo.getList(); |
|
|
|
List<TDxInvoice> resultList = pageInfo.getList(); |
|
|
|
|
|
|
|
|
|
|
|