Browse Source

Merge remote-tracking branch 'origin/dev_ic_data' into develop

dev_shibei_match
yinzuomei 4 years ago
parent
commit
bbbaf3dac9
  1. 1
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java

1
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java

@ -480,6 +480,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
if(CollectionUtils.isNotEmpty(formDTO.getEpmetUserIdList())){ if(CollectionUtils.isNotEmpty(formDTO.getEpmetUserIdList())){
userIds.addAll(formDTO.getEpmetUserIdList()); userIds.addAll(formDTO.getEpmetUserIdList());
} }
formDTO.setUserIds(userIds);
//2、小程序内自己上报+赋能平台待录入的 //2、小程序内自己上报+赋能平台待录入的
PageInfo<IcResiUserReportDemandRes> pageInfo = PageHelper.startPage(formDTO.getPageNo(), PageInfo<IcResiUserReportDemandRes> pageInfo = PageHelper.startPage(formDTO.getPageNo(),
formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectUserDemand(formDTO)); formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectUserDemand(formDTO));

Loading…
Cancel
Save