活动默认展示未开始跟进行中的活动

controllers/activity.go

@@ -2653,7 +2653,11 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 		condition += ` AND art.chart_permission_id  IN (` + chartPermissionIds + `)`
 	}
 	if activeState != "" {
-		condition += ` AND art.active_state  IN (` + activeState + `)`
+		if activeState == "1" {
+			condition += ` AND art.active_state  IN (1,2)`
+		} else {
+			condition += ` AND art.active_state  IN (` + activeState + `)`
+		}
 	} else {
 		condition += ` AND art.active_state  IN (1)`
 	}
@@ -3283,9 +3287,14 @@ func (this *ActivityCoAntroller) LabelTypeListV5() {
 			condition += ` AND art.activity_time <= ` + "'" + endDate + " 23:59:59'"
 		}
 		if activeState != "" {
-			condition += ` AND art.active_state  IN (` + activeState + `)`
+			// 默认查看未开始跟进行中
+			if activeState == "1" {
+				condition += ` AND art.active_state  IN (1,2)`
+			} else {
+				condition += ` AND art.active_state  IN (` + activeState + `)`
+			}
 		} else {
-			condition += ` AND art.active_state  IN (1)`
+			condition += ` AND art.active_state  IN (1,2)`
 		}
 		if (userType == 2 || userType == 3 || userType == 4) && strings.Contains(permissionStr, "专家") {
 			conditionOr += ` OR (  art.is_limit_people = 1 AND art.customer_type_ids LIKE '%4%'	 ` + condition + `) `

services/send_company_user.go

@@ -115,6 +115,9 @@ func DotongbuShangHai(cont context.Context) (err error) {
 		}
 	}
 	condition = ` AND p.modify_time > ` + "'" + updateTime + "'"
+
+	//偶尔需要单独同步某一个公司的人员
+	//condition = ` AND c.company_id  =  8284  `
 	//同30小时有变更的公司
 	go DotongbuShangHaApi(condition)