zt/canteen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/分账重构'

Browse Source 
# Conflicts:
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceServiceImpl.java
This commit is contained in:
seesaw
2024-08-19 15:01:22 +08:00
parent 53cebf639c 51f61628ab
commit 5188b60b97
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceServiceImpl.java
View File

@ -265,8 +265,10 @@ public class DevuceServiceImpl implements DevuceService {
for (DevuceDO devuceDO:devuceDOS){ for (DevuceDO devuceDO:devuceDOS){
DevuceListVO devuceListVO = new DevuceListVO(); DevuceListVO devuceListVO = new DevuceListVO();
BeanUtil.copyProperties(devuceDO,devuceListVO); BeanUtil.copyProperties(devuceDO,devuceListVO);
String dishesName = dishesMapper.selectById(devuceDO.getDishesId()).getDishesName(); DishesDO dishesDO = dishesMapper.selectById(devuceDO.getDishesId());
devuceListVO.setDishesName(dishesName); if(ObjUtil.isNotEmpty(dishesDO)&& ObjUtil.isNotEmpty(dishesDO.getDishesName())){
devuceListVO.setDishesName(dishesDO.getDishesName());
}
devuceListVOS.add(devuceListVO); devuceListVOS.add(devuceListVO);
} }
return devuceListVOS; return devuceListVOS;