Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branches 'master' and 'xzj' of https://gitee.com/darlk/ShengTangManage into xzj

Browse Source
This commit is contained in:
xiezhijun
2021-04-27 19:49:05 +08:00
parent bbbc4f2753 409c1e582f
commit bab4569b43
24 changed files with 312 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysDishesController.java
View File

@ -37,16 +37,7 @@ public class SysDishesController extends BaseController {
@GetMapping("/list")
public TableDataInfo list(SysDishes sysDishes) {
startPage();
List<SysDishes> list = sysDishesService.selectSysDishesList(sysDishes);
for (SysDishes dishes : list) {
List<SysDishesIngredient> ingredients = sysDishesService.selectSysIngreditentsById(dishes.getId());
if (StringUtils.isNull(ingredients)) {
dishes.setIgdList(new ArrayList<>());
} else {
dishes.setIgdList(ingredients);
}
}
return getDataTable(list);
return getDataTable(sysDishesService.selectSysDishesList(sysDishes));
}
/**