diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_delete.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_delete.ktr
index 7637f76..bec1999 100644
--- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_delete.ktr
+++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_delete.ktr
@@ -514,7 +514,7 @@
- 清空议题项目分类表
+ 清空月度议题项目趋势信息
ExecSQL
Y
@@ -529,7 +529,7 @@
N
Y
N
- delete from ys_classify where comm_id IS NULL and cal_date = date_format(now(), '%Y-%m')
+ delete from ys_trend_month where (comm_id IS NULL OR comm_id = '') and cal_date = date_format(now(), '%Y-%m')
N
@@ -547,12 +547,12 @@
656
- 368
+ 288
Y
- 清空月度议题项目趋势信息
+ 清空议题项目分类表
ExecSQL
Y
@@ -567,7 +567,7 @@
N
Y
N
- delete from ys_trend_month where comm_id = '' and cal_date = date_format(now(), '%Y-%m')
+ delete from ys_classify where (comm_id IS NULL OR comm_id = '') and cal_date = date_format(now(), '%Y-%m')
N
@@ -584,8 +584,8 @@
- 589
- 221
+ 656
+ 368
Y
diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_month_delete_st.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_month_delete_st.ktr
index 3987997..987bab3 100644
--- a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_month_delete_st.ktr
+++ b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_month_delete_st.ktr
@@ -533,7 +533,7 @@
FROM
ys_news
WHERE
- comm_id IS NULL
+ (comm_id IS NULL OR comm_id = '')
AND cal_date = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m')
N
@@ -572,7 +572,7 @@ AND cal_date = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m')
N
Y
N
- delete from ys_news where cal_date = concat(YEAR (NOW())) AND comm_id = '';
+ delete from ys_news where cal_date = concat(YEAR (NOW())) AND (comm_id IS NULL OR comm_id = '');
N
@@ -610,7 +610,7 @@ AND cal_date = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m')
N
Y
N
- delete from ys_classify where comm_id = '' and cal_date = concat(YEAR (NOW()));
+ delete from ys_classify where (comm_id IS NULL OR comm_id = '') and cal_date = concat(YEAR (NOW()));
N
@@ -653,7 +653,7 @@ AND cal_date = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m')
FROM
ys_classify
WHERE
- comm_id IS NULL
+ (comm_id IS NULL OR comm_id = '')
AND cal_date = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m')
N
@@ -696,7 +696,7 @@ AND cal_date = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m')
FROM
ys_trend_month
WHERE
- comm_id IS NULL
+ (comm_id IS NULL OR comm_id = '')
AND cal_date = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m')
N