no message

controllers/roadshow/calendar.go

@@ -73,7 +73,7 @@ func (this *CalendarController) Add() {
 	var checkIsAdd []string
 
 	//获取所有自定义的权益研究员
-	sysUserList, err := cygx.GetAskEmailList()
+	sysUserList, err := cygx.GetAskEmailListResearcher()
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败,GetAskEmailList Err: " + err.Error()
@@ -84,17 +84,6 @@ func (this *CalendarController) Add() {
 		raiAskadminMap[v.AdminId] = true
 	}
 
-	sysUserFwang, e := system.GetSysUserByAdminName("fwang") // 手动拼接王芳到权益的策略行业下 start
-	if e != nil {
-		if e.Error() == utils.ErrNoRow() {
-			br.Msg = "用户不存在, 请检查"
-			return
-		}
-		br.Msg = "账号错误, 请重新输入"
-		br.ErrMsg = "fwang 用户名获取用户失败, Err: " + e.Error()
-		return
-	}
-	raiAskadminMap[sysUserFwang.AdminId] = true // 手动拼接王芳到权益的策略行业下 end
 	//var tipMsg string
 	for _, v := range req.ResearcherList {
 		if v.ResearcherId <= 0 {
@@ -624,7 +613,7 @@ func (this *CalendarController) Edit() {
 	for _, ev := range existList {
 		existResearcherMap[ev.ResearcherId] = ev.ResearcherName
 	}
-	sysUserList, err := cygx.GetAskEmailList()
+	sysUserList, err := cygx.GetAskEmailListResearcher()
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败,GetAskEmailList Err: " + err.Error()
@@ -1070,7 +1059,7 @@ func (this *CalendarController) ResearcherList() {
 	for _, v := range sysUserList {
 		adminMap[v.AdminId] = v
 	}
-	askUserList, err := cygx.GetAskEmailList()
+	askUserList, err := cygx.GetAskEmailListResearcher()
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败,GetAskEmailList Err: " + err.Error()
@@ -1088,24 +1077,6 @@ func (this *CalendarController) ResearcherList() {
 		mapPermissionId[v.PermissionName] = v.ChartPermissionId
 	}
 
-	sysUserFwang, e := system.GetSysUserByAdminName("fwang") // 手动拼接王芳到权益的策略行业下 start
-	if e != nil {
-		if e.Error() == utils.ErrNoRow() {
-			br.Msg = "用户不存在, 请检查"
-			return
-		}
-		br.Msg = "账号错误, 请重新输入"
-		br.ErrMsg = "fwang 用户名获取用户失败, Err: " + e.Error()
-		return
-	}
-	itemFwang := new(roadshow.ResearcherGroup)
-	itemFwang.AdminId = sysUserFwang.AdminId
-	itemFwang.GroupId = sysUserFwang.GroupId
-	itemFwang.GroupName = sysUserFwang.GroupName
-	itemFwang.RealName = sysUserFwang.RealName
-	itemFwang.RoleTypeCode = sysUserFwang.RoleTypeCode
-	mapPermissionUser["策略"] = append(mapPermissionUser["策略"], itemFwang) // 手动拼接王芳到权益的策略行业下 end
-
 	for _, v := range askUserList {
 		if admin, ok := adminMap[v.AdminId]; ok {
 			item := &roadshow.ResearcherGroup{

controllers/roadshow/report.go

@@ -40,7 +40,7 @@ func (this *CalendarController) ResearcherReportList() {
 	dataType := this.GetString("DataType")
 	startDate := this.GetString("StartDate")
 	endDate := this.GetString("EndDate")
-	//companyType := this.GetString("CompanyType", "ficc")
+	companyType := this.GetString("CompanyType", "ficc")
 	var adminDataList []roadshowService.AdminDataMap
 	var err error
 	//var firstDate time.Time
@@ -72,9 +72,17 @@ func (this *CalendarController) ResearcherReportList() {
 			br.ErrMsg = "数据异常，Err:" + err.Error()
 			return
 		}
+	}
+
+	var group []*roadshow.ResearcherGroup
 
+	switch companyType {
+	case utils.COMPANY_CLASSIFY_FICC:
+		group, err = roadshow.GetResearcherGroup()
+	case utils.COMPANY_CLASSIFY_RAI:
+		group, err = roadshow.GetResearcherGroup()
 	}
-	group, err := roadshow.GetResearcherGroup()
+
 	if err != nil {
 		br.Msg = "获取信息失败！"
 		br.ErrMsg = "获取分组信息失败！Err:" + err.Error()

models/cygx/activity_ask_email.go

@@ -42,6 +42,14 @@ func GetAskEmailList() (item []*AskEmailRep, err error) {
 	return
 }
 
+// 权益自定义研究员信息
+func GetAskEmailListResearcher() (item []*AskEmailRep, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := `SELECT * FROM cygx_activity_ask_email WHERE  chart_permission_name != ''  AND enabled_researcher = 1 AND admin_id > 0    ORDER BY sort  DESC`
+	_, err = o.Raw(sql).QueryRows(&item)
+	return
+}
+
 func UpdateAskEmail(item *AskEmailRep) (err error) {
 	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `UPDATE cygx_activity_ask_email SET admin_id=? where mobile=?`