bug
This commit is contained in:
parent
78795abc73
commit
33c27b15a1
@ -168,8 +168,8 @@ public class ActiveDiscountServiceImpl extends ServiceImpl<ActiveDiscountMapper,
|
|||||||
activeDiscountVO.setDieselUserLevel(str.split(","));
|
activeDiscountVO.setDieselUserLevel(str.split(","));
|
||||||
}
|
}
|
||||||
activeDiscountVO.setActiveDiscountChildList(activeDiscountChildList);
|
activeDiscountVO.setActiveDiscountChildList(activeDiscountChildList);
|
||||||
TAccount accountInfoById = accountService.getAccountInfoById(Integer.parseInt(s.getCreateBy()));
|
// TAccount accountInfoById = accountService.getAccountInfoById(Integer.parseInt(s.getCreateBy()));
|
||||||
if (ObjectUtil.isNotEmpty(accountInfoById)) activeDiscountVO.setCreateBy(accountInfoById.getRealName());
|
// if (ObjectUtil.isNotEmpty(accountInfoById)) activeDiscountVO.setCreateBy(accountInfoById.getRealName());
|
||||||
return activeDiscountVO;
|
return activeDiscountVO;
|
||||||
}).collect(Collectors.toList());
|
}).collect(Collectors.toList());
|
||||||
page1.setRecords(activeConsumptionVOList);
|
page1.setRecords(activeConsumptionVOList);
|
||||||
|
Loading…
Reference in New Issue
Block a user