diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysRecipesTemplateController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysRecipesTemplateController.java index 272c1cdf7..869f5ffa5 100644 --- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysRecipesTemplateController.java +++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysRecipesTemplateController.java @@ -29,8 +29,8 @@ public class SysRecipesTemplateController extends BaseController { * 查询 */ @PreAuthorize("@ss.hasPermi('recipes:template:list')") - @GetMapping("/list") - public TableDataInfo list(SysRecipesTemplate sysRecipesTemplate) { + @PostMapping("/list") + public TableDataInfo list(@RequestBody SysRecipesTemplate sysRecipesTemplate) { startPage(); List list = iSysRecipesTemplateService.selectRecipesTemplateListByCondition(sysRecipesTemplate); return getDataTable(list); diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesTemplate.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesTemplate.java index f09334a9a..852575c92 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesTemplate.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesTemplate.java @@ -36,4 +36,6 @@ public class SysRecipesTemplate { Long recipesId; Integer reviewStatus; + + String[] keys; } diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysRecipesTemplateMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysRecipesTemplateMapper.xml index dac9aa98a..98d612f0d 100644 --- a/stdiet-custom/src/main/resources/mapper/custom/SysRecipesTemplateMapper.xml +++ b/stdiet-custom/src/main/resources/mapper/custom/SysRecipesTemplateMapper.xml @@ -31,7 +31,11 @@ left join sys_user su_nutritionist on su_nutritionist.user_id = srt.nutritionist_id and su_nutritionist.del_flag = 0 left join sys_user su_nutritionist_assis on su_nutritionist_assis.user_id = srt.nutri_assis_id and su_nutritionist_assis.del_flag = 0 where srt.del_flag = 0 - and srt.name like concat('%', #{name}, '%') or srt.remark like concat('%', #{name}, '%') + and + + srt.name like concat('%', #{key}, '%') or srt.remark like concat('%', #{key}, '%') + + and srt.nutri_assis_id = #{nutriAssisId} and srt.nutritionist_id = #{nutritionistId} and srp.review_status = #{reviewStatus} diff --git a/stdiet-ui/src/api/custom/recipesTemplate.js b/stdiet-ui/src/api/custom/recipesTemplate.js index 4d8167140..00df9655f 100644 --- a/stdiet-ui/src/api/custom/recipesTemplate.js +++ b/stdiet-ui/src/api/custom/recipesTemplate.js @@ -1,10 +1,11 @@ import request from "@/utils/request"; -export function listRecipesTemplate(query) { +export function listRecipesTemplate(data) { return request({ url: "/recipes/template/list", - method: "get", - params: query + method: "post", + // params: query + data }); } diff --git a/stdiet-ui/src/views/custom/recipesBuild/RecommendView/TemplateView/index.vue b/stdiet-ui/src/views/custom/recipesBuild/RecommendView/TemplateView/index.vue index a944afc0f..d8cdee2f9 100644 --- a/stdiet-ui/src/views/custom/recipesBuild/RecommendView/TemplateView/index.vue +++ b/stdiet-ui/src/views/custom/recipesBuild/RecommendView/TemplateView/index.vue @@ -1,7 +1,7 @@