From 0870212c5841a2268048dffdfeacd290533b733a Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 30 Jun 2020 10:44:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=97=E9=81=93=E6=B8=85=E7=A9=BA=E8=A1=A8?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=B8=85=E7=90=86=E6=89=80=E6=9C=89=E4=B8=BA?=
 =?UTF-8?q?null=E5=92=8C=E7=A9=BA=E5=AD=97=E7=AC=A6=E7=9A=84=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen_totality_street_delete.ktr              | 14 +++++++-------
 .../screen-yushan/yushan_month_delete_st.ktr       | 10 +++++-----
 2 files changed, 12 insertions(+), 12 deletions(-)

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 @@
   <order>
   </order>
   <step>
-    <name>清空议题项目分类表</name>
+    <name>清空月度议题项目趋势信息</name>
     <type>ExecSQL</type>
     <description/>
     <distribute>Y</distribute>
@@ -529,7 +529,7 @@
     <single_statement>N</single_statement>
     <replace_variables>Y</replace_variables>
     <quoteString>N</quoteString>
-    <sql>delete from ys_classify where comm_id IS NULL and cal_date = date_format(now(), '%Y-%m')</sql>
+    <sql>delete from ys_trend_month where (comm_id IS NULL OR comm_id = '') and cal_date = date_format(now(), '%Y-%m')</sql>
     <set_params>N</set_params>
     <insert_field/>
     <update_field/>
@@ -547,12 +547,12 @@
     </remotesteps>
     <GUI>
       <xloc>656</xloc>
-      <yloc>368</yloc>
+      <yloc>288</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
   <step>
-    <name>清空月度议题项目趋势信息</name>
+    <name>清空议题项目分类表</name>
     <type>ExecSQL</type>
     <description/>
     <distribute>Y</distribute>
@@ -567,7 +567,7 @@
     <single_statement>N</single_statement>
     <replace_variables>Y</replace_variables>
     <quoteString>N</quoteString>
-    <sql>delete from ys_trend_month where comm_id = '' and cal_date = date_format(now(), '%Y-%m')</sql>
+    <sql>delete from ys_classify where (comm_id IS NULL OR comm_id = '') and cal_date = date_format(now(), '%Y-%m')</sql>
     <set_params>N</set_params>
     <insert_field/>
     <update_field/>
@@ -584,8 +584,8 @@
       </output>
     </remotesteps>
     <GUI>
-      <xloc>589</xloc>
-      <yloc>221</yloc>
+      <xloc>656</xloc>
+      <yloc>368</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
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')</sql>
     <set_params>N</set_params>
     <insert_field/>
@@ -572,7 +572,7 @@ AND cal_date = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m')</sql>
     <single_statement>N</single_statement>
     <replace_variables>Y</replace_variables>
     <quoteString>N</quoteString>
-    <sql>delete from ys_news where cal_date = concat(YEAR (NOW())) AND comm_id = '';</sql>
+    <sql>delete from ys_news where cal_date = concat(YEAR (NOW())) AND (comm_id IS NULL OR comm_id = '');</sql>
     <set_params>N</set_params>
     <insert_field/>
     <update_field/>
@@ -610,7 +610,7 @@ AND cal_date = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m')</sql>
     <single_statement>N</single_statement>
     <replace_variables>Y</replace_variables>
     <quoteString>N</quoteString>
-    <sql>delete from ys_classify where comm_id = '' and cal_date = concat(YEAR (NOW()));
+    <sql>delete from ys_classify where (comm_id IS NULL OR comm_id = '') and cal_date = concat(YEAR (NOW()));
 </sql>
     <set_params>N</set_params>
     <insert_field/>
@@ -653,7 +653,7 @@ AND cal_date = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m')</sql>
 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')</sql>
     <set_params>N</set_params>
     <insert_field/>
@@ -696,7 +696,7 @@ AND cal_date = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m')</sql>
 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')</sql>
     <set_params>N</set_params>
     <insert_field/>