专家权限修改

controllers/activity.go

@@ -236,9 +236,16 @@ func (this *ActivityCoAntroller) ActivityList() {
 	}
 	condition += ` AND art.publish_status = 1 `
 	var conditionOr string
-	if strings.Contains(permissionStr, "专家") && (userType == 2 || userType == 3 || userType == 4) {
-		conditionOr += ` OR (  art.is_limit_people = 1 AND art.customer_type_ids LIKE '%4%'	 ` + permissionSqlStr + condition + `) `
-		conditionOr += ` OR (  art.is_limit_people = 1 AND art.activity_type_id = 3  AND art.customer_type_ids LIKE '%4%'	 ` + condition + `) `
+	//if strings.Contains(permissionStr, "专家") && (userType == 2 || userType == 3 || userType == 4) {
+	//conditionOr += ` OR (  art.is_limit_people = 1 AND art.customer_type_ids LIKE '%4%'	 ` + permissionSqlStr + condition + `) `
+	//conditionOr += ` OR (  art.is_limit_people = 1 AND art.activity_type_id = 3  AND art.customer_type_ids LIKE '%4%'	 ` + condition + `) `
+	//}
+	// 有专家权限的这几种用户，不做行业权限校验
+	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 + `) `
+	}
+	if (userType == 5) && strings.Contains(permissionStr, "专家") {
+		conditionOr += ` OR (  art.is_limit_people = 1 AND art.customer_type_ids LIKE '%5%'	 ` + condition + `) `
 	}
 	conditionOr += `	OR ( art.is_limit_people = 0 	  ` + condition + `) `
 	condition += ` AND art.is_limit_people = 1 ` + permissionSqlStr + sqlExport + conditionOr

services/task.go

@@ -16,40 +16,40 @@ import (
 func Task() {
 	fmt.Println("start")
 	//同步数据
-	if utils.RunMode == "release" {
-		//syncTacticsList := toolbox.NewTask("syncTacticsList", "0 */5 * * * *", SyncTacticsList)
-		//toolbox.AddTask("syncTacticsList", syncTacticsList)
-		//toolbox.StartTask()
-		syncTacticsListAddreport := toolbox.NewTask("syncTacticsListAddreport", "0 */5 * * * *", SyncTacticsListAddreport)
-		toolbox.AddTask("syncTacticsListAddreport", syncTacticsListAddreport)
-
-		//同步纪要库中的Es
-		//syncTacticsListToEs := toolbox.NewTask("syncTacticsListToEs", "0 */30 * * * *", SyncTacticsListToEs)
-		//toolbox.AddTask("syncTacticsListToEs", syncTacticsListToEs)
-		getSummarytoEs := toolbox.NewTask("getSummarytoEs", "0 */30 * * * *", GetSummarytoEs) //同步纪要库内容到Es
-		toolbox.AddTask("getSummarytoEs", getSummarytoEs)
-
-		//toolbox.StartTask()
-	}
-
-	//UpdateActivitySattus()
-	//修改任务状态
-	updateActivitySattus := toolbox.NewTask("syncTacticsListAddreport", "0 */1 8-22 * * *", UpdateActivitySattus)
-	toolbox.AddTask("updateActivitySattus", updateActivitySattus)
-	//更新深 和新的标签
-	updateIndustrialManagementLabel := toolbox.NewTask("updateIndustrialManagementLabel", "0 */30 * * * *", UpdateIndustrialManagementLabel)
-	toolbox.AddTask("updateIndustrialManagementLabel", updateIndustrialManagementLabel)
-	//更新报告的搜索栏内容
-	//UpdateIndustrialManagementSubjectNnames()
-	//会议提醒模板消息推送
-	sendActivityBeginMsg := toolbox.NewTask("sendActivityBeginMsg", "0 */10 8-22 * * *", SendActivityBeginMsg) //会议前60分钟的提醒
-	toolbox.AddTask("sendActivityBeginMsg", sendActivityBeginMsg)
-	sendActivityBeginMsgMeeting := toolbox.NewTask("sendActivityBeginMsgMeeting", "0 */5 8-22 * * *", SendActivityBeginMsgMeeting) //会议前15分钟的提醒
-	toolbox.AddTask("sendActivityBeginMsgMeeting", sendActivityBeginMsgMeeting)
-
-	//预约外呼名单，会前1小时自动发送邮件给专家组
-	sendEmailFileToExpert := toolbox.NewTask("sendEmailFileToExpert", "0 */5 8-22 * * *", SendEmailFileToExpert) //预约外呼名单，会前1小时自动发送邮件给专家组
-	toolbox.AddTask("sendEmailFileToExpert", sendEmailFileToExpert)
+	//if utils.RunMode == "release" {
+	//	//syncTacticsList := toolbox.NewTask("syncTacticsList", "0 */5 * * * *", SyncTacticsList)
+	//	//toolbox.AddTask("syncTacticsList", syncTacticsList)
+	//	//toolbox.StartTask()
+	//	syncTacticsListAddreport := toolbox.NewTask("syncTacticsListAddreport", "0 */5 * * * *", SyncTacticsListAddreport)
+	//	toolbox.AddTask("syncTacticsListAddreport", syncTacticsListAddreport)
+	//
+	//	//同步纪要库中的Es
+	//	//syncTacticsListToEs := toolbox.NewTask("syncTacticsListToEs", "0 */30 * * * *", SyncTacticsListToEs)
+	//	//toolbox.AddTask("syncTacticsListToEs", syncTacticsListToEs)
+	//	getSummarytoEs := toolbox.NewTask("getSummarytoEs", "0 */30 * * * *", GetSummarytoEs) //同步纪要库内容到Es
+	//	toolbox.AddTask("getSummarytoEs", getSummarytoEs)
+	//
+	//	//toolbox.StartTask()
+	//}
+	//
+	////UpdateActivitySattus()
+	////修改任务状态
+	//updateActivitySattus := toolbox.NewTask("syncTacticsListAddreport", "0 */1 8-22 * * *", UpdateActivitySattus)
+	//toolbox.AddTask("updateActivitySattus", updateActivitySattus)
+	////更新深 和新的标签
+	//updateIndustrialManagementLabel := toolbox.NewTask("updateIndustrialManagementLabel", "0 */30 * * * *", UpdateIndustrialManagementLabel)
+	//toolbox.AddTask("updateIndustrialManagementLabel", updateIndustrialManagementLabel)
+	////更新报告的搜索栏内容
+	////UpdateIndustrialManagementSubjectNnames()
+	////会议提醒模板消息推送
+	//sendActivityBeginMsg := toolbox.NewTask("sendActivityBeginMsg", "0 */10 8-22 * * *", SendActivityBeginMsg) //会议前60分钟的提醒
+	//toolbox.AddTask("sendActivityBeginMsg", sendActivityBeginMsg)
+	//sendActivityBeginMsgMeeting := toolbox.NewTask("sendActivityBeginMsgMeeting", "0 */5 8-22 * * *", SendActivityBeginMsgMeeting) //会议前15分钟的提醒
+	//toolbox.AddTask("sendActivityBeginMsgMeeting", sendActivityBeginMsgMeeting)
+	//
+	////预约外呼名单，会前1小时自动发送邮件给专家组
+	//sendEmailFileToExpert := toolbox.NewTask("sendEmailFileToExpert", "0 */5 8-22 * * *", SendEmailFileToExpert) //预约外呼名单，会前1小时自动发送邮件给专家组
+	//toolbox.AddTask("sendEmailFileToExpert", sendEmailFileToExpert)
 	//UpdateActivitySattus()
 	toolbox.StartTask()
 	fmt.Println("end")