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

!222 新增食谱制作时按病症筛选功能

Browse Source 
Merge pull request !222 from 德仔/develop
This commit is contained in:
德仔
2021-04-27 11:56:18 +08:00
committed by Gitee
parent e0f9a65e0d a24a9e8674
commit f6f4efa6fc
21 changed files with 276 additions and 174 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));
}
/**