Merge branch 'CRM_15.5' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/cygx/enter_score.go

@@ -59,7 +59,7 @@ func (this *EnterScoreController) CompanySearchList() {
 	}
 
 	//权益申请销售只能看到自己名下的客户的申请
-	companyIds, err := cygxService.GetAdminLookUserCompanyIdsBySelf(sysUser)
+	companyIds, err := cygxService.GetAdminLookUserCompanyIdsByResearcher(sysUser)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败，GetAdminLookUserCompanyIds Err:" + err.Error()
@@ -169,7 +169,7 @@ func (this *EnterScoreController) EnterScoreDetail() {
 			mapFiccUser[v.GroupName] = append(mapFiccUser[v.GroupName], item)
 		}
 
-		permissionFiccNameArr := []string{"宏观组", "建材组", "有色组", "能化组"}
+		permissionFiccNameArr := []string{"宏观组", "建材组", "有色组", "能化组", "海外组"}
 		for _, v := range permissionFiccNameArr {
 			item := new(cygx.EnterScorePermissionListResp)
 			item.ChartPermissionName = v
@@ -869,7 +869,7 @@ func (this *EnterScoreController) EnterScoreScoreOverview() {
 	}
 
 	//权益申请销售只能看到自己名下的客户的申请
-	companyIds, err := cygxService.GetAdminLookUserCompanyIdsBySelf(AdminUser)
+	companyIds, err := cygxService.GetAdminLookUserCompanyIdsByResearcher(AdminUser)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败，GetAdminLookUserCompanyIds Err:" + err.Error()
@@ -1390,7 +1390,7 @@ func (this *EnterScoreController) EnterScoreRankingOverview() {
 	}
 
 	//权益申请销售只能看到自己名下的客户的申请
-	companyIds, err := cygxService.GetAdminLookUserCompanyIdsBySelf(AdminUser)
+	companyIds, err := cygxService.GetAdminLookUserCompanyIdsByResearcher(AdminUser)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败，GetAdminLookUserCompanyIdsBySelf Err:" + err.Error()

models/system/sys_admin.go

@@ -515,7 +515,7 @@ func GetRaiAdmin() (items []*AdminItem, err error) {
 // GetFiccEnterScoreAdmin 获取Ficc需要录分的研究员
 func GetFiccEnterScoreAdmin() (items []*AdminItem, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT   *  FROM admin WHERE group_name  IN('宏观组','建材组','有色组','能化组')  AND enabled = 1 `
+	sql := `SELECT   *  FROM admin WHERE group_name  IN('宏观组','建材组','有色组','能化组','海外组')  AND enabled = 1 `
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }

services/cygx/admin_power.go

@@ -141,3 +141,29 @@ func GetAdminLookUserCompanyIdsBySelf(sysUser *system.Admin) (companyIds []int,
 	}
 	return
 }
+
+// 获取这个销售所能查看的公司权限(研究员)
+func GetAdminLookUserCompanyIdsByResearcher(sysUser *system.Admin) (companyIds []int, err error) {
+	//如果不是管理员，权益管理员那么就对可见权限范围做处理
+	adminIds := make([]int, 0)
+	if sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_ADMIN && sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_RAI_ADMIN && sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_RAI_RESEARCHR {
+
+		adminIds = append(adminIds, sysUser.AdminId)
+		var adminIdGroup string
+		for _, v := range adminIds {
+			adminIdGroup += strconv.Itoa(v) + ","
+		}
+		adminIdGroup = strings.TrimRight(adminIdGroup, ",")
+		companyProductList, e := company.GetCompanyProductsBySellerId(adminIdGroup)
+		if e != nil {
+			err = errors.New("GetCompanyProductsBySellerId , Err: " + e.Error())
+			return
+		}
+
+		for _, v := range companyProductList {
+			companyIds = append(companyIds, v.CompanyId)
+		}
+		companyIds = append(companyIds, 0) //添加潜在客户
+	}
+	return
+}