Merge branch 'crm_16.2' of http://8.136.199.33:3000/hongze/hongze_mobile_admin into debug

controllers/roadshow/calendar.go

@@ -2160,16 +2160,26 @@ func (this *CalendarController) MyCalendarDetail() {
 	var pars []interface{}
 
 	roleTypeCode := sysUser.RoleTypeCode
-	//销售
-	if roleTypeCode == utils.ROLE_TYPE_CODE_FICC_SELLER ||
-		roleTypeCode == utils.ROLE_TYPE_CODE_RAI_SELLER ||
-		roleTypeCode == utils.ROLE_TYPE_CODE_FICC_GROUP ||
-		roleTypeCode == utils.ROLE_TYPE_CODE_RAI_GROUP ||
-		roleTypeCode == utils.ROLE_TYPE_CODE_RAI_ADMIN { // 王芳也作为销售身份处理 {
-		condition += ` AND a.sys_user_id=?`
-		pars = append(pars, sysUser.AdminId)
 
-		condition += ` AND a.activity_type IN('路演','公开会议','沙龙') `
+	//权益销售
+	if roleTypeCode == utils.ROLE_TYPE_CODE_RAI_SELLER ||
+		roleTypeCode == utils.ROLE_TYPE_CODE_RAI_GROUP {
+		//if calendarType == 2 {
+		condition += ` AND  ( a.sys_user_id=?  OR a.seller_id=?  OR a.share_seller_id=?  )  `
+		pars = append(pars, sysUser.AdminId, sysUser.AdminId, sysUser.AdminId)
+		//}
+	} else {
+		//销售
+		if roleTypeCode == utils.ROLE_TYPE_CODE_FICC_SELLER ||
+			roleTypeCode == utils.ROLE_TYPE_CODE_RAI_SELLER ||
+			roleTypeCode == utils.ROLE_TYPE_CODE_FICC_GROUP ||
+			roleTypeCode == utils.ROLE_TYPE_CODE_RAI_GROUP ||
+			roleTypeCode == utils.ROLE_TYPE_CODE_RAI_ADMIN { // 王芳也作为销售身份处理 {
+			condition += ` AND a.sys_user_id=?`
+			pars = append(pars, sysUser.AdminId)
+
+			condition += ` AND a.activity_type IN('路演','公开会议','沙龙') `
+		}
 	}
 
 	//研究员