hongze hace 1 año
padre
commit
70290e164a
Se han modificado 1 ficheros con 5 adiciones y 2 borrados
  1. 5 2
      models/overseas_custom/custom.go

+ 5 - 2
models/overseas_custom/custom.go

@@ -59,6 +59,7 @@ func (obj *Custom) GetCustomTotal(condition string, pars []interface{}) (list []
 				t.view_total,0 AS road_show_total,t.create_time,'' AS last_view_time,t.is_hide,t.overseas_status,t.overseas_label
 				FROM %s.english_company AS t
 				INNER JOIN overseas_custom_seller AS n ON t.seller_id=n.seller_id
+				WHERE 1=1 AND t.is_deleted=0
 				)AS m
 		WHERE 1=1                       
 `
@@ -105,6 +106,7 @@ func (obj *Custom) GetCustomOverseasStatusTotal(condition string, pars []interfa
 				t.view_total,0 AS road_show_total,t.create_time,'' AS last_view_time,t.is_hide,t.overseas_status,t.overseas_label
 				FROM %s.english_company AS t
 				INNER JOIN overseas_custom_seller AS n ON t.seller_id=n.seller_id
+				WHERE 1=1 AND t.is_deleted=0
 				)AS m
 		WHERE 1=1
  AND m.is_hide=0  
@@ -170,7 +172,7 @@ func (obj *Custom) GetCustomListCount(condition string, pars []interface{}, comp
 				t.view_total,0 AS road_show_total,t.create_time,'' AS last_view_time,t.is_hide,t.overseas_status,t.overseas_label
 				FROM %s.english_company AS t
 				INNER JOIN overseas_custom_seller AS n ON t.seller_id=n.seller_id
-             WHERE 1=1 `
+             WHERE 1=1 AND t.is_deleted=0 `
 	if companyStatus == "试用" {
 		sql += ` AND t.enabled IN(1,2)`
 	} else if companyStatus == "禁用" {
@@ -228,7 +230,7 @@ func (obj *Custom) GetCustomList(condition string, pars []interface{}, companySt
 				1 AS source,t.overseas_label
 				FROM %s.english_company AS t
 				INNER JOIN overseas_custom_seller AS n ON t.seller_id=n.seller_id
-             WHERE 1=1 `
+             WHERE 1=1 AND t.is_deleted=0 `
 	if companyStatus == "试用" {
 		sql += ` AND t.enabled IN(1,2)`
 	} else if companyStatus == "禁用" {
@@ -355,6 +357,7 @@ func (obj *Custom) GetCustomOverseasLabelTotal(condition string, pars []interfac
 				t.view_total,0 AS road_show_total,t.create_time,'' AS last_view_time,t.is_hide,t.overseas_status,t.overseas_label
 				FROM %s.english_company AS t
 				INNER JOIN overseas_custom_seller AS n ON t.seller_id=n.seller_id
+				WHERE 1=1 AND t.is_deleted=0
 				)AS m
 		WHERE 1=1                       
 `