From ff8cce06c46b3b6af2a18c6afdd11d2417daec1c Mon Sep 17 00:00:00 2001 From: kyebyungha Date: Mon, 14 Mar 2022 13:06:01 +0900 Subject: [PATCH] =?UTF-8?q?=ED=8C=9D=EC=97=85=EA=B2=80=EC=83=89=20?= =?UTF-8?q?=EC=8B=9C=20=EC=9E=90=EB=A3=8C=20=EC=97=86=EC=9D=8C=20=ED=91=9C?= =?UTF-8?q?=EC=8B=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com.backoffice.m.bf_food_info.xml | 2 +- .../m/bf_daily_nutrition/include_ajax_data.ftl | 2 +- .../view_bf_daily_nutrition_9.ftl | 15 ++++++++++++--- .../views/ftl/m/bf_growth/food_balance.ftl | 2 +- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/main/resources/sqlmap/m/bf_food_info/com.backoffice.m.bf_food_info.xml b/src/main/resources/sqlmap/m/bf_food_info/com.backoffice.m.bf_food_info.xml index 4cf3ad6..e8de93b 100644 --- a/src/main/resources/sqlmap/m/bf_food_info/com.backoffice.m.bf_food_info.xml +++ b/src/main/resources/sqlmap/m/bf_food_info/com.backoffice.m.bf_food_info.xml @@ -57,7 +57,7 @@ AND dqi_cate like N'%$dqi_cate$%' - OR dqi_cate like N'%$dqi_cate$%' + OR dqi_cate like N'%$dqi_cate2$%' ORDER BY prd_nm DESC diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_ajax_data.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_ajax_data.ftl index bc76299..39b0ece 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_ajax_data.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_ajax_data.ftl @@ -89,7 +89,7 @@ function ajax_data(keyword){ }); }else{ var ul_board = $('#ul_board'); - ul_board.append("
  • 조회되는 분유가 없습니다.
  • "); + ul_board.append("
  • 조회되는 자료가 없습니다.
  • "); } is_loading = false; diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_9.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_9.ftl index 1256134..21e3235 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_9.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_9.ftl @@ -464,7 +464,10 @@ if(top > scrolHeight - 5) { list_more('N') } - }); + }); + }else{ + var ul_board = $('#ul_board'); + ul_board.append("
  • 조회되는 자료가 없습니다.
  • "); } is_loading = false; @@ -534,7 +537,10 @@ if(top > scrolHeight - 5) { list_more2('N') } - }); + }); + }else{ + var ul_board = $('#ul_board1'); + ul_board.append("
  • 조회되는 자료가 없습니다.
  • "); } is_loading = false; @@ -609,7 +615,10 @@ if(top > scrolHeight - 5) { list_more2('N') } - }); + }); + }else{ + var ul_board = $('#ul_board2'); + ul_board.append("
  • 조회되는 자료가 없습니다.
  • "); } is_loading = false; diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_growth/food_balance.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_growth/food_balance.ftl index 3dafeba..ed80f71 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_growth/food_balance.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_growth/food_balance.ftl @@ -116,7 +116,7 @@ <#if model['ingre']?has_content> <#list model['ingre'] as item>
  • - +

    ${item['name_real']!}