街道清空表时，清理所有为null和空字符的数据

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>

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/>