审批修改

@@ -269,7 +269,8 @@ select * from (
 	##公司公开的机会
 	##公司公开的机会
 	select id,user_id,create_at,source_content,review_status,audit_template_id,chance_type_id,comment_total,zan_total,view_total,enable_status,department_id from chance
 	select id,user_id,create_at,source_content,review_status,audit_template_id,chance_type_id,comment_total,zan_total,view_total,enable_status,department_id from chance
 	where  company_id = %v and publish_status = 2
 	where  company_id = %v and publish_status = 2
-	
+	UNION
+
 	##指定部门-机会提交的部门
 	##指定部门-机会提交的部门
 	select id,user_id,create_at,source_content,review_status,audit_template_id,chance_type_id,comment_total,zan_total,view_total,enable_status,department_id from chance
 	select id,user_id,create_at,source_content,review_status,audit_template_id,chance_type_id,comment_total,zan_total,view_total,enable_status,department_id from chance
 	where  department_id in (%v)
 	where  department_id in (%v)
@@ -296,6 +297,7 @@ select count(0) from (
 	##公司公开的机会
 	##公司公开的机会
 	select id,user_id,create_at,source_content,review_status,audit_template_id,chance_type_id,comment_total,zan_total,view_total,enable_status,department_id from chance
 	select id,user_id,create_at,source_content,review_status,audit_template_id,chance_type_id,comment_total,zan_total,view_total,enable_status,department_id from chance
 	where  company_id = %v and publish_status = 2
 	where  company_id = %v and publish_status = 2
+	UNION
 
 
 	##指定部门-机会提交的部门
 	##指定部门-机会提交的部门
 	select id,user_id,create_at,source_content,review_status,audit_template_id,chance_type_id,comment_total,zan_total,view_total,enable_status,department_id from chance
 	select id,user_id,create_at,source_content,review_status,audit_template_id,chance_type_id,comment_total,zan_total,view_total,enable_status,department_id from chance