Merge branch 'master' of http://8.136.199.33:3000/hongze/hz_crm_api into cygx/mfyx_2.0

controllers/classify.go

@@ -1,8 +1,9 @@
 package controllers
 
 import (
-	"github.com/rdlucklib/rdluck_tools/paging"
+	"encoding/json"
 	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/services"
 	"hongze/hz_crm_api/utils"
 )
 
@@ -11,10 +12,9 @@ type ClassifyController struct {
 	BaseAuthController
 }
 
+// ListClassify
 // @Title 获取分类列表
 // @Description 获取分类列表
-// @Param   PageSize   query   int  true       "每页数据条数"
-// @Param   CurrentIndex   query   int  true       "当前页页码，从1开始"
 // @Param   KeyWord   query   string  true       "检索关键词"
 // @Param   CompanyType   query   string  false       "产品类型，枚举值：'ficc','权益';不传默认返回全部"
 // @Param   HideDayWeek   query   int  false       "是否隐藏晨周报"
@@ -26,123 +26,21 @@ func (this *ClassifyController) ListClassify() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
-	pageSize, _ := this.GetInt("PageSize")
-	currentIndex, _ := this.GetInt("CurrentIndex")
 	keyWord := this.GetString("KeyWord")
 	companyType := this.GetString("CompanyType")
 	hideDayWeek, _ := this.GetInt("HideDayWeek")
 
-	var startSize int
-	if pageSize <= 0 {
-		pageSize = utils.PageSize20
-	}
-	if currentIndex <= 0 {
-		currentIndex = 1
-	}
-
-	startSize = utils.StartIndex(currentIndex, pageSize)
-	list, err := models.GetClassifyList(startSize, pageSize, keyWord, companyType, hideDayWeek)
-	if err != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取失败，Err:" + err.Error()
-		return
-	}
-	total, err := models.GetClassifyListCount(keyWord, companyType, hideDayWeek)
+	req := new(services.GetClassifyListReq)
+	req.Keyword = keyWord
+	req.CompanyType = companyType
+	req.HideDayWeek = hideDayWeek
+	resp, err := services.GetClassifyList(req)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败，Err:" + err.Error()
 		return
 	}
 
-	parentIds := make([]int, 0)
-	for i := range list {
-		parentIds = append(parentIds, list[i].Id)
-	}
-	parentIdLen := len(parentIds)
-	if parentIdLen == 0 {
-		resp := &models.ClassifyListResp{
-			List:   list,
-			Paging: paging.GetPaging(currentIndex, pageSize, 0),
-		}
-		br.Data = resp
-		br.Ret = 200
-		br.Success = true
-		br.Msg = "获取成功"
-		return
-	}
-
-	// 获取一级分类-子目录列表
-	menuListMap := make(map[int][]*models.ClassifyMenu, 0)
-	var menuCond string
-	var menuPars []interface{}
-	menuCond += ` AND classify_id IN (` + utils.GetOrmInReplace(parentIdLen) + `)`
-	menuPars = append(menuPars, parentIds)
-	parentMenus, e := models.GetClassifyMenuList(menuCond, menuPars)
-	if e != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取一级分类子目录列表失败"
-		return
-	}
-	for i := range parentMenus {
-		if menuListMap[parentMenus[i].ClassifyId] == nil {
-			menuListMap[parentMenus[i].ClassifyId] = make([]*models.ClassifyMenu, 0)
-		}
-		menuListMap[parentMenus[i].ClassifyId] = append(menuListMap[parentMenus[i].ClassifyId], parentMenus[i])
-	}
-
-	// 获取子分类
-	children, e := models.GetClassifyChildByParentIds(parentIds, keyWord)
-	if e != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取子分类失败"
-		return
-	}
-	childrenIds := make([]int, 0)
-	for i := range children {
-		childrenIds = append(childrenIds, children[i].Id)
-	}
-	childrenIdsLen := len(childrenIds)
-
-	// 获取二级分类-子目录关联
-	relateMap := make(map[int]int, 0)
-	if childrenIdsLen > 0 {
-		var relateCond string
-		var relatePars []interface{}
-		relateCond += ` AND classify_id IN (` + utils.GetOrmInReplace(childrenIdsLen) + `)`
-		relatePars = append(relatePars, childrenIds)
-		relates, e := models.GetClassifyMenuRelationList(relateCond, relatePars)
-		if e != nil {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取二级分类子目录关联失败, Err: " + e.Error()
-			return
-		}
-		for i := range relates {
-			relateMap[relates[i].ClassifyId] = relates[i].MenuId
-		}
-	}
-
-	// 二级分类
-	childrenMap := make(map[int][]*models.ClassifyItem, 0)
-	for i := range children {
-		if childrenMap[children[i].ParentId] == nil {
-			childrenMap[children[i].ParentId] = make([]*models.ClassifyItem, 0)
-		}
-		childrenMap[children[i].ParentId] = append(childrenMap[children[i].ParentId], &models.ClassifyItem{
-			Classify:       *children[i],
-			ClassifyMenuId: relateMap[children[i].Id],
-		})
-	}
-
-	// 一级分类
-	for i := range list {
-		list[i].ClassifyMenuList = menuListMap[list[i].Id]
-		list[i].Child = childrenMap[list[i].Id]
-	}
-
-	page := paging.GetPaging(currentIndex, pageSize, total)
-	resp := new(models.ClassifyListResp)
-	resp.List = list
-	resp.Paging = page
 	br.Data = resp
 	br.Ret = 200
 	br.Success = true
@@ -154,6 +52,7 @@ func (this *ClassifyController) ListClassify() {
 // @Success 200 {object} models.Classify
 // @router /tel_list [get]
 func (this *ClassifyController) TelListClassify() {
+	// todo 获取电话会 是否需要改成从中间服务项目中获取
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		this.Data["json"] = br
@@ -189,3 +88,52 @@ func (this *ClassifyController) TelListClassify() {
 	br.Success = true
 	br.Msg = "获取成功"
 }
+
+// Edit
+// @Title 编辑报告分类
+// @Description 编辑报告分类
+// @Param	request  body  services.EditClassifyReq  true  "type json string"
+// @Success 200 string "操作成功"
+// @router /edit [post]
+func (this *ClassifyController) Edit() {
+	br := new(models.BaseResponse).Init()
+	br.IsSendEmail = false
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+	var req services.EditClassifyReq
+	if err := json.Unmarshal(this.Ctx.Input.RequestBody, &req); err != nil {
+		br.Msg = "参数解析异常！"
+		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+		return
+	}
+	if req.ClassifyId <= 0 {
+		br.Msg = "分类ID有误"
+		return
+	}
+
+	err, errMsg := services.EditReportClassify(&req)
+	if err != nil {
+		br.Msg = errMsg
+		br.ErrMsg = "编辑报告分类失败, Err:" + err.Error()
+		return
+	}
+
+	// 清除小程序端的章节缓存
+	{
+		key := "hongze_yb:report_chapter_type:GetEffectTypeID"
+		_ = utils.Rc.Delete(key)
+	}
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "操作成功"
+}

controllers/company.go

@@ -369,10 +369,16 @@ func (this *CompanyController) SearchList() {
 
 		btnItem := new(company.ButtonPermission)
 		if item.CompanyId != 1 {
-			*btnItem = services.GetCompanyPermissionButton(roleTypeCode, itemStatus, item.SellerIds, item.GroupIds, item.GroupId, sysUser.GroupId, item.SellerId, sysUser.AdminId, sysUser.Authority, item.ProductId, item.ShareSellerId)
+			*btnItem = services.GetCompanyPermissionButton(roleTypeCode, itemStatus, item.SellerIds, item.GroupIds, item.GroupId, sysUser.GroupId, item.SellerId, sysUser.AdminId, sysUser.Authority, item.ProductId, -1, item.ShareSellerIds)
 			//根据销售"领取客户"的权限对部分按钮做限制
 			btnItem = services.GetCompanyPermissionButtonByReceiveEnabled(btnItem, receiveEnabled)
 		}
+		if list[i].IsShare == 1 && btnItem.BtnModifySeller == true && roleTypeCode == utils.ROLE_TYPE_CODE_RAI_ADMIN {
+			//如果已经是共享客户了，取消共享按钮全都显示，和修改销售权限一样
+			btnItem.BtnShare = true
+		}
+		// 客户搜索页不要共享客户按钮
+		btnItem.BtnShare = false
 		//如果是权益客户，操作者又是权益管理员，那么就对他进行展示研选详情按钮
 		if strings.Contains(item.CompanyType, utils.COMPANY_CLASSIFY_RAI) && sysUser.RoleName == utils.ROLE_TYPE_RAI_PRODUCT {
 			btnItem.IsResearchShow = true
@@ -679,11 +685,11 @@ func (this *CompanyController) List() {
 				if status == "全部" {
 					////如果是筛选了流失客户状态
 					if sysUser.Authority <= 0 {
-						condition += ` AND (b.seller_id=? OR status='流失')  `
-						pars = append(pars, sysUser.AdminId)
+						condition += ` AND (b.seller_id=? OR status='流失' OR (b.share_seller_id = ? AND b.is_share = 1))  `
+						pars = append(pars, sysUser.AdminId, sysUser.AdminId)
 
-						permissionCondition += ` AND b.seller_id=? `
-						permissionPars = append(permissionPars, sysUser.AdminId)
+						permissionCondition += `  AND (b.seller_id=? OR status='流失' OR (b.share_seller_id = ? AND b.is_share = 1))  `
+						permissionPars = append(permissionPars, sysUser.AdminId, sysUser.AdminId)
 					} else {
 						if sysUser.Authority == 1 {
 							condition += ` AND (b.department_id=?  OR status='流失')`
@@ -794,16 +800,16 @@ func (this *CompanyController) List() {
 
 							// 是否包含共享客户(新增合同时, 关键词搜索客户为true)
 							if includeShare {
-								condition += ` AND (b.seller_id = ? OR (a.share_seller_id = ? AND a.is_share = 1)) `
+								condition += ` AND (b.seller_id = ? OR (b.share_seller_id = ? AND b.is_share = 1)) `
 								pars = append(pars, sysUser.AdminId, sysUser.AdminId)
 							} else {
-								condition += ` AND b.seller_id=?  `
-								pars = append(pars, sysUser.AdminId)
+								condition += ` AND (b.seller_id = ? OR (b.share_seller_id = ? AND b.is_share = 1)) `
+								pars = append(pars, sysUser.AdminId, sysUser.AdminId)
 							}
 						}
 
-						permissionCondition += ` AND b.seller_id=? `
-						permissionPars = append(permissionPars, sysUser.AdminId)
+						permissionCondition += `  AND (b.seller_id=? OR (b.share_seller_id = ? AND b.is_share = 1))  `
+						permissionPars = append(permissionPars, sysUser.AdminId, sysUser.AdminId)
 					} else {
 						if sysUser.Authority == 1 {
 							if status != utils.COMPANY_STATUS_LOSE {
@@ -1323,11 +1329,11 @@ func (this *CompanyController) List() {
 		//按钮显示控制
 		btnItem := new(company.ButtonPermission)
 		if item.CompanyId != 1 {
-			*btnItem = services.GetCompanyPermissionButton(roleTypeCode, itemStatus, item.GroupIds, item.GroupIds, item.GroupId, sysUser.GroupId, item.SellerId, sysUser.AdminId, sysUser.Authority, item.ProductId, item.ShareSellerId)
+			*btnItem = services.GetCompanyPermissionButton(roleTypeCode, itemStatus, item.SellerIds, item.GroupIds, item.GroupId, sysUser.GroupId, item.SellerId, sysUser.AdminId, sysUser.Authority, item.ProductId, -1, item.ShareSellerIds)
 			//根据销售"领取客户"的权限对部分按钮做限制
 			btnItem = services.GetCompanyPermissionButtonByReceiveEnabled(btnItem, receiveEnabled)
 		}
-		if list[i].IsShare == 1 && btnItem.BtnModifySeller == true {
+		if list[i].IsShare == 1 && btnItem.BtnModifySeller == true && roleTypeCode == utils.ROLE_TYPE_CODE_RAI_ADMIN {
 			//如果已经是共享客户了，取消共享按钮全都显示，和修改销售权限一样
 			btnItem.BtnShare = true
 		}
@@ -1597,10 +1603,11 @@ func (this *CompanyController) List() {
 			//viewTotal:=GetviewTotal(v.CompanyId)
 
 			//活跃（客户状态）
-			tmpStatus := v.Status
-			if v.IsShare == 1 {
-				tmpStatus = v.Status + "(共享)"
-			}
+			//if v.IsShare != 1 {
+			//	if v.BtnItem.BtnModifySeller == true {
+			//		v.BtnItem.BtnModifySeller = false
+			//	}
+			//}
 			//productIdSlice := strings.Split(v.ProductIds, "/")
 			//statusSlice := strings.Split(v.Status, "/")
 			//for productIndex, tmpProductId := range productIdSlice {
@@ -1699,7 +1706,7 @@ func (this *CompanyController) List() {
 				RenewalReason:    v.RenewalReason,
 				FreezeReason:     v.FreezeReason,
 				LossTime:         v.LossTime,
-				Status:           tmpStatus,
+				Status:           v.StatusStr,
 				CompanyType:      v.CompanyType,
 				ApproveStatus:    v.ApproveStatus,
 				SellerName:       v.SellerName,
@@ -1750,14 +1757,23 @@ func (this *CompanyController) List() {
 				IsShare:         v.IsShare,
 				CloseTime:       v.CloseTime,
 				CloseReason:     v.CloseReason,
-				ShareSeller:     v.ShareSeller,
 				ShareSellerId:   v.ShareSellerId,
-			}
-			if v.ShareSellerId != 0 {
-				shareSeller := adminMap[v.ShareSellerId]
-				if shareSeller != nil {
-					companyList.ShareSeller = shareSeller.RealName + "(" + shareSeller.GroupName + ")"
+				ShareSellerIds:  v.ShareSellerIds,
+			}
+			if v.ShareSellerIds != "" {
+				shareSellerIds := strings.Split(v.ShareSellerIds, ",")
+				for _, idStr := range shareSellerIds {
+					shareSellerId, e := strconv.Atoi(idStr)
+					if e != nil {
+						err = e
+						return
+					}
+					shareSeller := adminMap[shareSellerId]
+					if shareSeller != nil {
+						companyList.ShareSeller += shareSeller.RealName + "(" + shareSeller.GroupName + ")" + "/"
+					}
 				}
+				companyList.ShareSeller = strings.TrimRight(companyList.ShareSeller, "/")
 			}
 			companyLists = append(companyLists, companyList)
 		}
@@ -3086,15 +3102,30 @@ func (this *CompanyController) Detail() {
 	}
 	// CRM8.8-是否为编辑页的客户详情
 	isEdit, _ := this.GetBool("IsEdit")
+
+	productId := services.GetProductId(sysUser.RoleTypeCode)
 	item, err := company.GetCompanyDetailById(companyId)
 	if err != nil {
 		br.Msg = "获取信息失败"
 		br.ErrMsg = "获取数据失败，Err:" + err.Error()
 		return
 	}
-	shareSellerId := item.ShareSellerId
+	shareSellerId := 0
+	var productItem *company.CompanyProduct
+	if productId > 0 {
+		var e error
+		productItem, e = company.GetCompanyProductByCompanyIdAndProductId(companyId, productId)
+		if e != nil && e.Error() != utils.ErrNoRow() {
+			br.Msg = "客户信息有误"
+			br.ErrMsg = "获取客户信息失败, Err: " + e.Error()
+			return
+		}
+		if productItem != nil {
+			shareSellerId = productItem.ShareSellerId
+		}
+	}
+
 	var productName string
-	productId := services.GetProductId(sysUser.RoleTypeCode)
 	if productId == 1 {
 		productName = utils.COMPANY_PRODUCT_FICC_NAME
 	} else if productId == 2 {
@@ -3137,7 +3168,7 @@ func (this *CompanyController) Detail() {
 						break
 					}
 					// 分享的客户 也有权限
-					if item.IsShare == 1 && item.ShareSellerId == sysUser.AdminId {
+					if productItem.IsShare == 1 && productItem.ShareSellerId == sysUser.AdminId {
 						isOk = true
 						break
 					}
@@ -3233,51 +3264,61 @@ func (this *CompanyController) Detail() {
 					}
 				}
 			}
-			for _, v := range utils.PermissionFiccClassifyArr {
-				checkList := make([]int, 0)
-				plist := new(company.PermissionLookList)
-				items, err := company.GetPermissionLookItems(item.ProductId, v)
-				if err != nil {
-					br.Msg = "获取失败"
-					br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
-					return
-				}
-				for itemK, n := range items {
-					permission, err := company.GetCompanyPermissionCheckItem(companyId, n.ChartPermissionId)
-					if err != nil && err.Error() != utils.ErrNoRow() {
-						br.Msg = "获取失败"
-						br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
-						return
+			// 编辑回显
+			allPermissions, e := company.GetPermissionLookItemsByProductId(utils.COMPANY_PRODUCT_FICC_ID)
+			if e != nil {
+				br.Msg = "获取失败"
+				br.ErrMsg = "获取权限信息失败，Err:" + e.Error()
+				return
+			}
+			permissionMap := make(map[int][]*company.PermissionLookItem, 0)
+			permissionCheckMap := make(map[int][]int, 0)
+			for _, v := range allPermissions {
+				if v.ParentId > 0 {
+					permissionMap[v.ParentId] = append(permissionMap[v.ParentId], v)
+					if v.IsPublic == 1 {
+						permissionCheckMap[v.ParentId] = append(permissionCheckMap[v.ParentId], v.ChartPermissionId)
 					}
-					if permission != nil && permission.ChartPermissionId > 0 {
-						checkList = append(checkList, n.ChartPermissionId)
-						items[itemK].StartDate = permission.StartDate
-						items[itemK].EndDate = permission.EndDate
-						items[itemK].Status = permission.Status
-
-						endDateTime, _ := time.Parse(utils.FormatDate, permission.EndDate)
-						endDateTime = endDateTime.AddDate(0, 0, 1)
-						sub := endDateTime.Sub(time.Now())
-						if sub < 0 {
-							sub = 0
+				}
+			}
+			for _, v := range allPermissions {
+				if v.ParentId == 0 {
+					checkList := make([]int, 0)
+					plist := new(company.PermissionLookList)
+					plist.Items = make([]*company.PermissionLookItem, 0)
+					plist.ItemsType = make([]*company.PermissionSetItemType, 0)
+					items, ok := permissionMap[v.ChartPermissionId]
+					if ok {
+						for itemK, n := range items {
+							permission, err := company.GetCompanyPermissionCheckItem(companyId, n.ChartPermissionId)
+							if err != nil && err.Error() != utils.ErrNoRow() {
+								br.Msg = "获取失败"
+								br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
+								return
+							}
+							if permission != nil && permission.ChartPermissionId > 0 {
+								checkList = append(checkList, n.ChartPermissionId)
+								items[itemK].StartDate = permission.StartDate
+								items[itemK].EndDate = permission.EndDate
+								items[itemK].Status = permission.Status
+
+								endDateTime, _ := time.Parse(utils.FormatDate, permission.EndDate)
+								endDateTime = endDateTime.AddDate(0, 0, 1)
+								sub := endDateTime.Sub(time.Now())
+								if sub < 0 {
+									sub = 0
+								}
+								expireDay := fmt.Sprintf("%v", int(sub.Hours()/24))
+								items[itemK].ExpireDay = expireDay
+							}
 						}
-						expireDay := fmt.Sprintf("%v", int(sub.Hours()/24))
-						items[itemK].ExpireDay = expireDay
+						plist.Items = items
 					}
-					//count, err := company.GetCompanyPermissionCheck(companyId, n.ChartPermissionId)
-					//if err != nil {
-					//	br.Msg = "获取失败"
-					//	br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
-					//	return
-					//}
-					//if count > 0 {
-					//	checkList = append(checkList, n.ChartPermissionId)
-					//}
+					plist.ClassifyName = v.PermissionName
+					plist.CheckList = checkList
+					item.PermissionList = append(item.PermissionList, plist)
 				}
-				plist.Items = items
-				plist.ClassifyName = v
-				plist.CheckList = checkList
-				item.PermissionList = append(item.PermissionList, plist)
+
 			}
 			resp.FiccItem = item
 			if resp.FiccItem.Status == utils.COMPANY_STATUS_FOREVER {
@@ -3293,7 +3334,7 @@ func (this *CompanyController) Detail() {
 				if item.Status == utils.COMPANY_STATUS_FREEZE || item.Status == utils.COMPANY_STATUS_LOSE {
 					btnDetailItem.BtnHistoryList = true
 				} else {
-					if item.SellerId == sysUser.AdminId {
+					if item.SellerId == sysUser.AdminId || item.ShareSellerId == sysUser.AdminId {
 						btnDetailItem.BtnHistoryList = true
 					}
 					if sysUser.Authority > 0 {
@@ -3336,7 +3377,7 @@ func (this *CompanyController) Detail() {
 				resp.IsButtonShow = 1
 			}
 		}
-		btnItem := services.GetCompanyPermissionButton(roleTypeCode, item.Status, strconv.Itoa(item.SellerId), strconv.Itoa(item.GroupId), item.GroupId, sysUser.GroupId, item.SellerId, sysUser.AdminId, sysUser.Authority, item.ProductId, shareSellerId)
+		btnItem := services.GetCompanyPermissionButton(roleTypeCode, item.Status, strconv.Itoa(item.SellerId), strconv.Itoa(item.GroupId), item.GroupId, sysUser.GroupId, item.SellerId, sysUser.AdminId, sysUser.Authority, item.ProductId, shareSellerId, "")
 		//if itemLen > 1 {
 		//	btnDetailItem.BtnEdit = false
 		//	btnDetailItem.BtnDelete = false
@@ -3519,7 +3560,7 @@ func (this *CompanyController) DetailByCreditCode() {
 		br.Data = resp
 		return
 	}
-	shareSellerId := item.ShareSellerId
+
 	companyId := item.CompanyId
 	var productName string
 	productId := services.GetProductId(sysUser.RoleTypeCode)
@@ -3574,51 +3615,51 @@ func (this *CompanyController) DetailByCreditCode() {
 					}
 				}
 			}
-			for _, v := range utils.PermissionFiccClassifyArr {
-				checkList := make([]int, 0)
-				plist := new(company.PermissionLookList)
-				items, err := company.GetPermissionLookItems(item.ProductId, v)
-				if err != nil {
-					br.Msg = "获取失败"
-					br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
-					return
-				}
-				for itemK, n := range items {
-					permission, err := company.GetCompanyPermissionCheckItem(companyId, n.ChartPermissionId)
-					if err != nil && err.Error() != utils.ErrNoRow() {
-						br.Msg = "获取失败"
-						br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
-						return
-					}
-					if permission != nil && permission.ChartPermissionId > 0 {
-						checkList = append(checkList, n.ChartPermissionId)
-						items[itemK].StartDate = permission.StartDate
-						items[itemK].EndDate = permission.EndDate
-						items[itemK].Status = permission.Status
-
-						endDateTime, _ := time.Parse(utils.FormatDate, permission.EndDate)
-						endDateTime = endDateTime.AddDate(0, 0, 1)
-						sub := endDateTime.Sub(time.Now())
-						if sub < 0 {
-							sub = 0
+			//子权限切片集合
+			allFiccPermissions, permissionMap, e := services.GetBasePermissionLookItem(utils.COMPANY_PRODUCT_FICC_ID)
+			if e != nil {
+				br.Msg = "查询基础权限失败"
+				br.ErrMsg = "查询基础权限失败,Err:" + e.Error()
+				return
+			}
+			//遍历获取
+			for _, v := range allFiccPermissions {
+				if v.ParentId == 0 {
+					checkList := make([]int, 0)
+					plist := new(company.PermissionLookList)
+					plist.Items = make([]*company.PermissionLookItem, 0)
+					items, ok1 := permissionMap[v.ChartPermissionId]
+					if ok1 {
+
+						for itemK, n := range items {
+							permission, e := company.GetCompanyPermissionCheckItem(companyId, n.ChartPermissionId)
+							if e != nil && e.Error() != utils.ErrNoRow() {
+								br.Msg = "获取失败"
+								br.ErrMsg = "获取权限信息失败，Err:" + e.Error()
+								return
+							}
+							if permission != nil && permission.ChartPermissionId > 0 {
+								checkList = append(checkList, n.ChartPermissionId)
+								items[itemK].StartDate = permission.StartDate
+								items[itemK].EndDate = permission.EndDate
+								items[itemK].Status = permission.Status
+
+								endDateTime, _ := time.Parse(utils.FormatDate, permission.EndDate)
+								endDateTime = endDateTime.AddDate(0, 0, 1)
+								sub := endDateTime.Sub(time.Now())
+								if sub < 0 {
+									sub = 0
+								}
+								expireDay := fmt.Sprintf("%v", int(sub.Hours()/24))
+								items[itemK].ExpireDay = expireDay
+							}
 						}
-						expireDay := fmt.Sprintf("%v", int(sub.Hours()/24))
-						items[itemK].ExpireDay = expireDay
+						plist.Items = items
 					}
-					//count, err := company.GetCompanyPermissionCheck(companyId, n.ChartPermissionId)
-					//if err != nil {
-					//	br.Msg = "获取失败"
-					//	br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
-					//	return
-					//}
-					//if count > 0 {
-					//	checkList = append(checkList, n.ChartPermissionId)
-					//}
+					plist.ClassifyName = v.PermissionName
+					plist.CheckList = checkList
+					item.PermissionList = append(item.PermissionList, plist)
 				}
-				plist.Items = items
-				plist.ClassifyName = v
-				plist.CheckList = checkList
-				item.PermissionList = append(item.PermissionList, plist)
 			}
 			resp.FiccItem = item
 			if (roleTypeCode == utils.ROLE_TYPE_CODE_FICC_SELLER ||
@@ -3705,7 +3746,8 @@ func (this *CompanyController) DetailByCreditCode() {
 				resp.IsButtonShow = 1
 			}
 		}
-		btnItem := services.GetCompanyPermissionButton(roleTypeCode, item.Status, strconv.Itoa(item.SellerId), strconv.Itoa(item.GroupId), item.GroupId, sysUser.GroupId, item.SellerId, sysUser.AdminId, sysUser.Authority, item.ProductId, shareSellerId)
+		btnItem := services.GetCompanyPermissionButton(roleTypeCode, item.Status, strconv.Itoa(item.SellerId), strconv.Itoa(item.GroupId),
+			item.GroupId, sysUser.GroupId, item.SellerId, sysUser.AdminId, sysUser.Authority, item.ProductId, item.ShareSellerId, "")
 		//if itemLen > 1 {
 		//	btnDetailItem.BtnEdit = false
 		//	btnDetailItem.BtnDelete = false
@@ -3731,7 +3773,7 @@ func (this *CompanyController) DetailByCreditCode() {
 
 		//联系人操作权限
 		if resp.IsContractButtonShow == false {
-			resp.IsContractButtonShow = services.CheckCompanyUserButton(sysUser.RoleTypeCode, item.SellerId, sysUser.AdminId, item.ProductId, shareSellerId, item.Status)
+			resp.IsContractButtonShow = services.CheckCompanyUserButton(sysUser.RoleTypeCode, item.SellerId, sysUser.AdminId, item.ProductId, item.ShareSellerId, item.Status)
 		}
 	}
 
@@ -7594,20 +7636,27 @@ func (this *CompanyController) PermissionList() {
 
 	for _, companyType := range companySlice {
 		//子权限切片集合
-		var permissionClassifyArr []string
+		//var permissionClassifyArr []string
+		var permissionProductId int
 		if companyType == "ficc" {
-			for _, v := range utils.PermissionFiccClassifyArr {
-				permissionClassifyArr = append(permissionClassifyArr, v)
-			}
+			permissionProductId = utils.COMPANY_PRODUCT_FICC_ID
 		} else {
-			permissionClassifyArr = append(permissionClassifyArr, "权益")
+			permissionProductId = utils.COMPANY_PRODUCT_RAI_ID
+		}
+		//子权限切片集合
+		permissionClassifyArr, err := models.GetPermissionFirstByProductId(permissionProductId)
+		if err != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
+			return
 		}
 
 		//遍历获取
 		for _, v := range permissionClassifyArr {
 			checkList := make([]int, 0)
 			plist := new(company.PermissionLookList)
-			items, err := company.GetPermissionLookItems(classifyMap[companyType], v)
+			plist.Items = make([]*company.PermissionLookItem, 0)
+			items, err := company.GetPermissionLookItemsByParentId(classifyMap[companyType], v.ChartPermissionId)
 			if err != nil {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
@@ -7654,7 +7703,7 @@ func (this *CompanyController) PermissionList() {
 				}
 				expireDay := fmt.Sprintf("%v", int(sub.Hours()/24))
 				items[i].ExpireDay = expireDay
-				items[i].ClassifyName = v
+				items[i].ClassifyName = v.PermissionName
 				//if n.PermissionType == 1 {
 				//	items[i].PermissionTypeName = "主观"
 				//} else if n.PermissionType == 2 {
@@ -7675,7 +7724,7 @@ func (this *CompanyController) PermissionList() {
 					}
 				}
 			}
-			plist.ClassifyName = v
+			plist.ClassifyName = v.PermissionName
 			plist.CheckList = checkList
 			if companyType == "ficc" {
 				resp.FiccPermissionList = append(resp.FiccPermissionList, plist)

controllers/company_apply.go

@@ -81,28 +81,38 @@ func (this *CompanyApplyController) ApplyContractHistoryList() {
 
 		productId = list[i].ProductId
 		if productId == 1 {
-			for _, v := range utils.PermissionFiccClassifyArr {
+			permissionClassifyArr, e := services.GetPermissionFirstArr(utils.COMPANY_PRODUCT_FICC_ID)
+			if e != nil {
+				br.Msg = "获取失败"
+				br.ErrMsg = "获取权限分类失败，Err:" + e.Error()
+				return
+			}
+			for _, v := range permissionClassifyArr {
 				checkList := make([]int, 0)
 				plist := new(company.ContractPermissionList)
-				items, err := company.GetPermissionLookItemsExt(productIdStr, v)
+				plist.Items = make([]*company.PermissionLookItem, 0)
+				items, err := company.GetPermissionLookItemsExtByParentId(productIdStr, v.ChartPermissionId)
 				if err != nil {
 					br.Msg = "获取失败"
 					br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
 					return
 				}
-				for _, n := range items {
-					count, err := company.GetCompanyContractPermissionCheckByContractId(companyId, companyContract.CompanyContractId, n.ChartPermissionId)
-					if err != nil {
-						br.Msg = "获取失败"
-						br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
-						return
-					}
-					if count > 0 {
-						checkList = append(checkList, n.ChartPermissionId)
+				if len(items) > 0 {
+					for _, n := range items {
+						count, err := company.GetCompanyContractPermissionCheckByContractId(companyId, companyContract.CompanyContractId, n.ChartPermissionId)
+						if err != nil {
+							br.Msg = "获取失败"
+							br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
+							return
+						}
+						if count > 0 {
+							checkList = append(checkList, n.ChartPermissionId)
+						}
 					}
+					plist.Items = items
 				}
-				plist.Items = items
-				plist.ClassifyName = v
+
+				plist.ClassifyName = v.PermissionName
 				plist.CheckList = checkList
 				list[i].PermissionList = append(list[i].PermissionList, plist)
 			}
@@ -398,30 +408,39 @@ func (this *CompanyApplyController) ApplyContractDetail() {
 	}
 
 	if detail.ProductId == 1 {
-		for _, v := range utils.PermissionFiccClassifyArr {
-			checkList := make([]int, 0)
-			plist := new(company.PermissionLookList)
-			items, err := company.GetPermissionLookItems(detail.ProductId, v)
-			if err != nil {
-				br.Msg = "获取失败"
-				br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
-				return
-			}
-			for _, n := range items {
-				count, err := company.GetCompanyContractPermissionCheckByContractId(companyId, detail.CompanyContractId, n.ChartPermissionId)
-				if err != nil {
-					br.Msg = "获取失败"
-					br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
+		//子权限切片集合
+		allFiccPermissions, permissionMap, e := services.GetBasePermissionLookItem(utils.COMPANY_PRODUCT_FICC_ID)
+		if e != nil {
+			br.Msg = "查询基础权限失败"
+			br.ErrMsg = "查询基础权限失败,Err:" + e.Error()
+			return
+		}
+		//遍历获取
+		for _, v := range allFiccPermissions {
+			if v.ParentId == 0 {
+				checkList := make([]int, 0)
+				plist := new(company.PermissionLookList)
+				items, ok := permissionMap[v.ChartPermissionId]
+				if !ok {
+					br.Msg = "获取权限信息失败"
 					return
 				}
-				if count > 0 {
-					checkList = append(checkList, n.ChartPermissionId)
+				for _, n := range items {
+					count, err := company.GetCompanyContractPermissionCheckByContractId(companyId, detail.CompanyContractId, n.ChartPermissionId)
+					if err != nil {
+						br.Msg = "获取失败"
+						br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
+						return
+					}
+					if count > 0 {
+						checkList = append(checkList, n.ChartPermissionId)
+					}
 				}
+				plist.Items = items
+				plist.ClassifyName = v.PermissionName
+				plist.CheckList = checkList
+				detail.PermissionList = append(detail.PermissionList, plist)
 			}
-			plist.Items = items
-			plist.ClassifyName = v
-			plist.CheckList = checkList
-			detail.PermissionList = append(detail.PermissionList, plist)
 		}
 	}
 
@@ -1920,30 +1939,46 @@ func (this *CompanyApplyController) ApplyContract() {
 	companyId := approvalRecord.CompanyId
 
 	if productId == 1 {
-		for _, v := range utils.PermissionFiccClassifyArr {
-			checkList := make([]int, 0)
-			plist := new(company.PermissionLookList)
-			items, err := company.GetPermissionLookItems(productId, v)
-			if err != nil {
-				br.Msg = "获取失败"
-				br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
-				return
-			}
-			for _, n := range items {
-				count, err := company.GetCompanyContractPermissionCheckByContractId(companyId, contractItem.CompanyContractId, n.ChartPermissionId)
-				if err != nil {
-					br.Msg = "获取失败"
-					br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
-					return
+		allFiccPermissions, e := company.GetPermissionLookItemsByProductId(utils.COMPANY_PRODUCT_FICC_ID)
+		if e != nil {
+			br.Msg = "获取权限信息失败"
+			br.ErrMsg = "获取权限信息失败，Err:" + e.Error()
+			return
+		}
+		permissionMap := make(map[int][]*company.PermissionLookItem, 0)
+		permissionCheckMap := make(map[int][]int, 0)
+		for _, v := range allFiccPermissions {
+			if v.ParentId > 0 {
+				permissionMap[v.ParentId] = append(permissionMap[v.ParentId], v)
+				if v.IsPublic == 1 {
+					permissionCheckMap[v.ParentId] = append(permissionCheckMap[v.ParentId], v.ChartPermissionId)
 				}
-				if count > 0 {
-					checkList = append(checkList, n.ChartPermissionId)
+			}
+		}
+		for _, v := range allFiccPermissions {
+			if v.ParentId == 0 {
+				checkList := make([]int, 0)
+				plist := new(company.PermissionLookList)
+				plist.Items = make([]*company.PermissionLookItem, 0)
+				items, ok := permissionMap[v.ChartPermissionId]
+				if ok {
+					for _, n := range items {
+						count, err := company.GetCompanyContractPermissionCheckByContractId(companyId, contractItem.CompanyContractId, n.ChartPermissionId)
+						if err != nil {
+							br.Msg = "获取失败"
+							br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
+							return
+						}
+						if count > 0 {
+							checkList = append(checkList, n.ChartPermissionId)
+						}
+					}
+					plist.Items = items
 				}
+				plist.ClassifyName = v.PermissionName
+				plist.CheckList = checkList
+				contractItem.PermissionList = append(contractItem.PermissionList, plist)
 			}
-			plist.Items = items
-			plist.ClassifyName = v
-			plist.CheckList = checkList
-			contractItem.PermissionList = append(contractItem.PermissionList, plist)
 		}
 	}
 

controllers/company_apply_v2.go

@@ -159,15 +159,8 @@ func (this *CompanyApplyController) ApplyServiceUpdate() {
 		return
 	}
 
-	companyItem, e := company.GetCompanyById(req.CompanyId)
-	if e != nil {
-		br.Msg = "客户信息有误"
-		br.ErrMsg = "获取客户信息失败, Err: " + e.Error()
-		return
-	}
-
 	//客户归属判断-当前销售/咨询组共享销售
-	if companyProduct.SellerId != sysUser.AdminId && companyItem.ShareSellerId != sysUser.AdminId {
+	if companyProduct.SellerId != sysUser.AdminId && companyProduct.ShareSellerId != sysUser.AdminId {
 		br.Msg = "客户信息异常"
 		br.ErrMsg = "客户信息异常，不是当前所属销售，客户所属销售：" + companyProduct.SellerName + ";当前销售:" + sysUser.AdminName
 		return
@@ -564,14 +557,8 @@ func (this *CompanyApplyController) ApplyTurnPositive() {
 		return
 	}
 
-	companyItem, e := company.GetCompanyById(req.CompanyId)
-	if e != nil {
-		br.Msg = "客户信息有误"
-		br.ErrMsg = "获取客户信息失败, Err: " + e.Error()
-		return
-	}
 	//客户归属判断
-	if companyProduct.SellerId != sysUser.AdminId && companyItem.ShareSellerId != sysUser.AdminId {
+	if companyProduct.SellerId != sysUser.AdminId && companyProduct.ShareSellerId != sysUser.AdminId {
 		br.Msg = "客户信息异常"
 		br.ErrMsg = "客户信息异常，不是当前所属销售，客户所属销售：" + companyProduct.SellerName + ";当前销售:" + sysUser.AdminName
 		return
@@ -921,7 +908,7 @@ func (this *CompanyApplyController) ApplyBySystemContract() {
 		br.ErrMsg = "客户不存在，不可提交审批：companyId:" + strconv.Itoa(req.CompanyId) + ";productId:" + strconv.Itoa(productId)
 		return
 	}
-	if companyProduct.SellerId != sysUser.AdminId && companyInfo.ShareSellerId != sysUser.AdminId {
+	if companyProduct.SellerId != sysUser.AdminId && companyProduct.ShareSellerId != sysUser.AdminId {
 		br.Msg = "客户信息异常"
 		br.ErrMsg = "客户信息异常，不是当前所属销售，客户所属销售：" + companyProduct.SellerName + ";当前销售:" + sysUser.AdminName
 		return
@@ -1499,14 +1486,8 @@ func (this *CompanyApplyController) ApplyThaw() {
 		return
 	}
 
-	companyItem, e := company.GetCompanyById(req.CompanyId)
-	if e != nil {
-		br.Msg = "客户信息有误"
-		br.ErrMsg = "获取客户信息失败, Err: " + e.Error()
-		return
-	}
 	//客户归属判断
-	if companyProduct.SellerId != sysUser.AdminId && companyItem.ShareSellerId != sysUser.AdminId {
+	if companyProduct.SellerId != sysUser.AdminId && companyProduct.ShareSellerId != sysUser.AdminId {
 		br.Msg = "客户信息异常"
 		br.ErrMsg = "客户信息异常，不是当前所属销售，客户所属销售：" + companyProduct.SellerName + ";当前销售:" + sysUser.AdminName
 		return
@@ -1753,14 +1734,8 @@ func (this *CompanyApplyController) ApplyDelay() {
 		return
 	}
 
-	companyItem, e := company.GetCompanyById(req.CompanyId)
-	if e != nil {
-		br.Msg = "客户信息有误"
-		br.ErrMsg = "获取客户信息失败, Err: " + e.Error()
-		return
-	}
 	//客户归属判断
-	if companyProduct.SellerId != sysUser.AdminId && companyItem.ShareSellerId != sysUser.AdminId {
+	if companyProduct.SellerId != sysUser.AdminId && companyProduct.ShareSellerId != sysUser.AdminId {
 		br.Msg = "客户信息异常"
 		br.ErrMsg = "客户信息异常，不是当前所属销售，客户所属销售：" + companyProduct.SellerName + ";当前销售:" + sysUser.AdminName
 		return

controllers/company_approval.go

@@ -655,15 +655,19 @@ func (this *CompanyApprovalController) GetApprovalPermissionList() {
 	}
 
 	//子权限切片集合
-	var permissionClassifyArr []string
+	var permissionProductId int
+
 	if approvalInfo.ProductId == 1 {
-		for _, v := range utils.PermissionFiccClassifyArr {
-			permissionClassifyArr = append(permissionClassifyArr, v)
-		}
+		permissionProductId = 1
 	} else {
-		permissionClassifyArr = append(permissionClassifyArr, "权益")
+		permissionProductId = 2
+	}
+	permissionClassifyArr, err := services.GetPermissionFirstArr(permissionProductId)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取权限分类失败，Err:" + err.Error()
+		return
 	}
-
 	//获取需要审批的权限
 	delayPermissionList, err := company.GetDelayPermissionItems(approvalInfo.CompanyId, approvalInfo.CompanyApprovalId)
 	if err != nil && err.Error() != utils.ErrNoRow() {
@@ -682,26 +686,31 @@ func (this *CompanyApprovalController) GetApprovalPermissionList() {
 	for _, v := range permissionClassifyArr {
 		checkList := make([]int, 0)
 		plist := new(company.PermissionLookList)
-		items, err := company.GetPermissionLookItems(approvalInfo.ProductId, v)
+		plist.Items = make([]*company.PermissionLookItem, 0)
+		items, err := company.GetPermissionLookItemsByParentId(approvalInfo.ProductId, v.ChartPermissionId)
 		if err != nil {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
 			return
 		}
-		//权益客户下，主观客观同时选择，进行合并
-		for _, n := range items {
-			if _, ok := delayPermissionIdMap[n.ChartPermissionId]; ok {
-				//if approvalInfo.ProductId == 2 {
-				//	if sandoPermissionIdMap[n.PermissionName] == 0 {
-				//		checkList = append(checkList, n.ChartPermissionId)
-				//	}
-				//	sandoPermissionIdMap[n.PermissionName] += 1
-				//} else {
-				//	checkList = append(checkList, n.ChartPermissionId)
-				//}
-				checkList = append(checkList, n.ChartPermissionId)
+		if len(items) > 0 {
+			//权益客户下，主观客观同时选择，进行合并
+			for _, n := range items {
+				if _, ok := delayPermissionIdMap[n.ChartPermissionId]; ok {
+					//if approvalInfo.ProductId == 2 {
+					//	if sandoPermissionIdMap[n.PermissionName] == 0 {
+					//		checkList = append(checkList, n.ChartPermissionId)
+					//	}
+					//	sandoPermissionIdMap[n.PermissionName] += 1
+					//} else {
+					//	checkList = append(checkList, n.ChartPermissionId)
+					//}
+					checkList = append(checkList, n.ChartPermissionId)
+				}
 			}
+			plist.Items = items
 		}
+
 		//if approvalInfo.ProductId == 2 {
 		//	for i, n := range items {
 		//		if sandoPermissionIdMap[n.PermissionName] == 1 {
@@ -709,8 +718,7 @@ func (this *CompanyApprovalController) GetApprovalPermissionList() {
 		//		}
 		//	}
 		//}
-		plist.Items = items
-		plist.ClassifyName = v
+		plist.ClassifyName = v.PermissionName
 		plist.CheckList = checkList
 		if approvalInfo.ProductId == 1 {
 			resp.FiccPermissionList = append(resp.FiccPermissionList, plist)

controllers/company_permission.go

@@ -17,6 +17,7 @@ type CompanyPermissionController struct {
 	BaseAuthController
 }
 
+// List
 // @Title 获取权限设置基础信息
 // @Description 获取权限设置基础信息接口
 // @Param   CompanyType   query   string  true       "客户类型：传空字符串或者不传为全部,'ficc','权益'"
@@ -50,23 +51,40 @@ func (this *CompanyPermissionController) List() {
 
 	// FICC
 	if productId == utils.COMPANY_PRODUCT_FICC_ID || companyType == utils.COMPANY_PRODUCT_FICC_NAME {
-		for _, v := range utils.PermissionFiccClassifyArr {
-			checkList := make([]int, 0)
-			p := new(company.PermissionSetList)
-			p.ClassifyName = v
-			items, err := company.GetPermissionSetItems(utils.COMPANY_PRODUCT_FICC_ID, v)
-			if err != nil {
-				br.Msg = "获取失败"
-				br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
-				return
+		items, err := company.GetPermissionByProductId(utils.COMPANY_PRODUCT_FICC_ID)
+		if err != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
+			return
+		}
+		permissionMap := make(map[int][]*company.PermissionSetItem, 0)
+		permissionCheckMap := make(map[int][]int, 0)
+		for _, v := range items {
+			if v.ParentId > 0 {
+				permissionMap[v.ParentId] = append(permissionMap[v.ParentId], v)
+				if v.IsPublic == 1 {
+					permissionCheckMap[v.ParentId] = append(permissionCheckMap[v.ParentId], v.ChartPermissionId)
+				}
 			}
-			p.Items = items
-			if v == "宏观经济" {
-				checkList = append(checkList, 1)
+		}
+		for _, v := range items {
+			if v.ParentId == 0 {
+				p := new(company.PermissionSetList)
+				p.Items = make([]*company.PermissionSetItem, 0)
+				p.CheckList = make([]int, 0)
+				p.ClassifyName = v.PermissionName
+
+				if subList, ok := permissionMap[v.ChartPermissionId]; ok {
+					p.Items = subList
+				}
+
+				if checkList, ok := permissionCheckMap[v.ChartPermissionId]; ok {
+					p.CheckList = checkList
+				}
+				resp.List = append(resp.List, p)
 			}
-			p.CheckList = checkList
-			resp.List = append(resp.List, p)
 		}
+
 		br.Ret = 200
 		br.Success = true
 		br.Msg = "获取成功"
@@ -228,27 +246,41 @@ func (this *CompanyPermissionController) ListByContract() {
 
 	roleTypeCode := sysUser.RoleTypeCode
 	productId = services.GetProductId(roleTypeCode)
-	if productId == 1 {
-		for _, v := range utils.PermissionFiccClassifyArr {
-			//合同这边市场策略不需要体现出来，所以调整返回
-			if v == "市场策略" {
-				continue
-			}
-			checkList := make([]int, 0)
-			p := new(company.PermissionSetList)
-			p.ClassifyName = v
-			items, err := company.GetPermissionSetItems(productId, v)
-			if err != nil {
-				br.Msg = "获取失败"
-				br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
-				return
+	if productId == 1 || companyType == utils.COMPANY_PRODUCT_FICC_NAME {
+		allFiccPermissions, err := company.GetPermissionByProductId(utils.COMPANY_PRODUCT_FICC_ID)
+		if err != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
+			return
+		}
+		permissionMap := make(map[int][]*company.PermissionSetItem, 0)
+		permissionCheckMap := make(map[int][]int, 0)
+		for _, v := range allFiccPermissions {
+			if v.ParentId > 0 {
+				permissionMap[v.ParentId] = append(permissionMap[v.ParentId], v)
+				if v.IsPublic == 1 {
+					permissionCheckMap[v.ParentId] = append(permissionCheckMap[v.ParentId], v.ChartPermissionId)
+				}
 			}
-			p.Items = items
-			if v == "宏观经济" {
-				checkList = append(checkList, 1)
+		}
+		for _, v := range allFiccPermissions {
+			if v.ParentId == 0 {
+				//合同这边市场策略不需要体现出来，所以调整返回
+				if v.PermissionName == "市场策略" {
+					continue
+				}
+				p := new(company.PermissionSetList)
+				p.Items = make([]*company.PermissionSetItem, 0)
+				p.CheckList = make([]int, 0)
+				p.ClassifyName = v.PermissionName
+				if subList, ok := permissionMap[v.ChartPermissionId]; ok {
+					p.Items = subList
+				}
+				if checkList, ok := permissionCheckMap[v.ChartPermissionId]; ok {
+					p.CheckList = checkList
+				}
+				resp.List = append(resp.List, p)
 			}
-			p.CheckList = checkList
-			resp.List = append(resp.List, p)
 		}
 	} else if productId == 2 {
 		checkList := make([]int, 0)
@@ -265,25 +297,7 @@ func (this *CompanyPermissionController) ListByContract() {
 		p.CheckList = checkList
 		resp.List = append(resp.List, p)
 	} else {
-		if companyType == utils.COMPANY_PRODUCT_FICC_NAME {
-			for _, v := range utils.PermissionFiccClassifyArr {
-				checkList := make([]int, 0)
-				p := new(company.PermissionSetList)
-				p.ClassifyName = v
-				items, err := company.GetPermissionSetItems(1, v)
-				if err != nil {
-					br.Msg = "获取失败"
-					br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
-					return
-				}
-				p.Items = items
-				if v == "宏观经济" {
-					checkList = append(checkList, 1)
-				}
-				p.CheckList = checkList
-				resp.List = append(resp.List, p)
-			}
-		} else {
+		if companyType != utils.COMPANY_PRODUCT_FICC_NAME {
 			v := "权益"
 			checkList := make([]int, 0)
 			p := new(company.PermissionSetList)
@@ -336,38 +350,33 @@ func (this *CompanyPermissionController) PermissionLook() {
 	productId := services.GetProductId(roleTypeCode)
 
 	resp := new(company.PermissionLookResp)
-	permissionArr := []string{}
+	permissionArr := make([]*models.ChartPermission, 0)
+	var err error
 	if lookType == 1 {
-		if productId == 1 {
-			for _, permission := range utils.PermissionFiccClassifyArr {
-				permissionArr = append(permissionArr, permission)
-			}
-		} else if productId == 2 {
-			permissionArr = []string{"权益"}
-		} else {
-			for _, permission := range utils.PermissionAllClassifyArr {
-				permissionArr = append(permissionArr, permission)
-			}
-		}
+		permissionArr, err = services.GetPermissionFirstArr(productId)
 	} else {
-		for _, permission := range utils.PermissionAllClassifyArr {
-			permissionArr = append(permissionArr, permission)
-		}
+		permissionArr, err = services.GetPermissionFirstArr(0)
+	}
+	if err != nil {
+		br.Msg = "获取权限失败"
+		br.ErrMsg = "获取权限失败 err:" + err.Error()
+		return
 	}
 	//ficc权限类目
 	for _, v := range permissionArr {
 		checkList := make([]int, 0)
 		p := new(company.PermissionLookList)
+		p.Items = make([]*company.PermissionLookItem, 0)
 		var productId int
 		//if v == "权益" {
 		//	productId = 2
 		//} else {
 		//	productId = 1
 		//}
-		if v != "权益" {
+		if v.PermissionName != "权益" {
 			productId = 1
 			//mapPermissionName := make(map[string]int)
-			items, err := company.GetPermissionLookItems(productId, v)
+			items, err := company.GetPermissionLookItemsByParentId(productId, v.ChartPermissionId)
 			if err != nil {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
@@ -413,7 +422,7 @@ func (this *CompanyPermissionController) PermissionLook() {
 				}
 				expireDay := fmt.Sprintf("%v", int(sub.Hours()/24))
 				items[i].ExpireDay = expireDay
-				items[i].ClassifyName = v
+				items[i].ClassifyName = v.PermissionName
 				if lookType == 1 {
 					permissionList = append(permissionList, items[i])
 				} else {
@@ -430,7 +439,7 @@ func (this *CompanyPermissionController) PermissionLook() {
 					mapPermissionNameList[v.PermissionName] = v.ChartPermissionId
 				}
 			}
-			p.ClassifyName = v
+			p.ClassifyName = v.PermissionName
 			//p.Items = permissionList
 			p.CheckList = checkList
 			if lookType == 1 {
@@ -452,7 +461,7 @@ func (this *CompanyPermissionController) PermissionLook() {
 	//权益权限类目
 	for _, v := range permissionArr {
 
-		if v == "权益" {
+		if v.PermissionName == "权益" {
 			// CRM8.8-权益权限列表调用较多、统一进行调整
 			unify := false
 			if lookType == 1 {
@@ -760,8 +769,34 @@ func (this *CompanyPermissionController) PermissionVariety() {
 		productId = 0
 	}
 
-	if productId == 1 {
-		for k, v := range utils.PermissionFiccClassifyArr {
+	if productId == 1 || companyType == utils.COMPANY_PRODUCT_FICC_NAME {
+		permissionFirst, e := services.GetPermissionFirstArr(utils.COMPANY_PRODUCT_FICC_ID)
+		if e != nil {
+			br.Msg = "获取权限信息失败"
+			br.ErrMsg = "获取权限信息失败，Err:" + e.Error()
+			return
+		}
+		allFiccPermissions, e := company.GetPermissionVarietyItemsByProductId(utils.COMPANY_PRODUCT_FICC_ID)
+		if e != nil {
+			br.Msg = "获取权限信息失败"
+			br.ErrMsg = "获取权限信息失败，Err:" + e.Error()
+			return
+		}
+		permissionMap := make(map[int][]*company.PermissionVarietyItem, 0)
+		for _, v := range allFiccPermissions {
+			permissionMap[v.ParentId] = append(permissionMap[v.ParentId], v)
+		}
+		for _, v := range permissionFirst {
+			p := new(company.PermissionVarietyList)
+			p.ClassifyName = v.ClassifyName
+			p.ChartPermissionId = v.ChartPermissionId + 100
+			items, ok := permissionMap[v.ChartPermissionId]
+			if ok {
+				p.Items = items
+			}
+			resp.List = append(resp.List, p)
+		}
+		/*for k, v := range utils.PermissionFiccClassifyArr {
 			p := new(company.PermissionVarietyList)
 			p.ClassifyName = v
 			p.ChartPermissionId = k + 100
@@ -773,7 +808,7 @@ func (this *CompanyPermissionController) PermissionVariety() {
 			}
 			p.Items = items
 			resp.List = append(resp.List, p)
-		}
+		}*/
 	} else if productId == 2 {
 		v := "权益"
 		p := new(company.PermissionVarietyList)
@@ -788,21 +823,7 @@ func (this *CompanyPermissionController) PermissionVariety() {
 		p.Items = items
 		resp.List = append(resp.List, p)
 	} else {
-		if companyType == utils.COMPANY_PRODUCT_FICC_NAME {
-			for k, v := range utils.PermissionFiccClassifyArr {
-				p := new(company.PermissionVarietyList)
-				p.ClassifyName = v
-				p.ChartPermissionId = k + 100
-				items, err := company.GetPermissionVarietyItems(1, v)
-				if err != nil {
-					br.Msg = "获取失败"
-					br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
-					return
-				}
-				p.Items = items
-				resp.List = append(resp.List, p)
-			}
-		} else if companyType == utils.COMPANY_PRODUCT_RAI_NAME {
+		if companyType == utils.COMPANY_PRODUCT_RAI_NAME {
 			v := "权益"
 			p := new(company.PermissionVarietyList)
 			p.ClassifyName = v

controllers/company_seller.go

@@ -2331,30 +2331,141 @@ func (this *CompanySellerController) ShareSellerList() {
 		br.Ret = 408
 		return
 	}
+	resp := make([]company.DepartmentGroupSellers, 0)
+
+	productId := services.GetProductId(sysUser.RoleTypeCode)
+	if productId == utils.COMPANY_PRODUCT_RAI_ID {
+		// 权益管理员，查看所有权益的账号
+		roleCodeTypeStr := `"` + utils.ROLE_TYPE_CODE_RAI_SELLER + `","` + utils.ROLE_TYPE_CODE_RAI_GROUP + `","` + utils.ROLE_TYPE_CODE_RAI_RESEARCHR + `","` + utils.ROLE_TYPE_CODE_RAI_ADMIN + `"`
+		departmentId := 5
+		enabled := 1
+		groupList, err := system.GetSysGroupByDepartmentId(departmentId)
+		if err != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取分组失败,Err:" + err.Error()
+			return
+		}
+		for _, group := range groupList {
+			groupSellerList := make([]company.DepartmentGroupSellers, 0)
+			groupItem := company.DepartmentGroupSellers{
+				AdminId: fmt.Sprint("group_", group.DepartmentId),
+				//AdminName string `description:"系统用户名称"`
+				RealName:     group.GroupName,
+				ChildrenList: groupSellerList,
+			}
+			teamList, err := system.GetSysTeamByDepartmentId(group.GroupId)
+			if err != nil {
+				br.Msg = "获取小组失败"
+				br.ErrMsg = "获取小组失败,Err:" + err.Error()
+				return
+			}
+			for _, team := range teamList {
+				teamSellerList := make([]company.DepartmentGroupSellers, 0)
+				teamItem := company.DepartmentGroupSellers{
+					AdminId: fmt.Sprint("team_", team.GroupId),
+					//AdminName string `description:"系统用户名称"`
+					RealName:     team.GroupName,
+					ChildrenList: teamSellerList,
+				}
+				sellerList, err := system.GetTeamSysUserList(team.GroupId, enabled)
+				if err != nil {
+					br.Msg = "获取销售失败"
+					br.ErrMsg = "获取销售失败,Err:" + err.Error()
+					return
+				}
+				for _, seller := range sellerList {
+					sellerItem := company.DepartmentGroupSellers{
+						AdminId: fmt.Sprint(seller.AdminId),
+						//AdminName string `description:"系统用户名称"`
+						RealName:     seller.RealName,
+						Authority:    seller.Authority,
+						RoleTypeCode: seller.RoleTypeCode,
+					}
+					//fmt.Println("seller.RealName:", seller.RealName)
+					teamSellerList = append(teamSellerList, sellerItem)
+				}
+				teamSellerList = sortDepartmentGroupSellers(teamSellerList)
+				teamItem.ChildrenList = teamSellerList
+				if len(teamSellerList) > 0 {
+					groupSellerList = append(groupSellerList, teamItem)
+				}
+			}
+			//分组为0的销售（直属分组）
+			groupTeamSellerList, err := system.GetGrooupsysUserList(group.GroupId, roleCodeTypeStr, enabled)
+			if err != nil {
+				br.Msg = "获取销售失败"
+				br.ErrMsg = "获取销售失败,Err:" + err.Error()
+				return
+			}
+			if len(groupTeamSellerList) > 0 {
+				tmpDepartmentGroupSellersList := make([]company.DepartmentGroupSellers, 0)
+				for _, seller := range groupTeamSellerList {
+					sellerItem := company.DepartmentGroupSellers{
+						AdminId: fmt.Sprint(seller.AdminId),
+						//AdminName string `description:"系统用户名称"`
+						RealName:     seller.RealName,
+						Authority:    seller.Authority,
+						RoleTypeCode: seller.RoleTypeCode,
+					}
+					tmpDepartmentGroupSellersList = append(tmpDepartmentGroupSellersList, sellerItem)
+				}
+				//排个序
+				tmpDepartmentGroupSellersList = sortDepartmentGroupSellers(tmpDepartmentGroupSellersList)
+				groupSellerList = append(groupSellerList, tmpDepartmentGroupSellersList...)
+			}
 
-	groupId := 0
-	if utils.RunMode == "release" {
-		groupId = 37
+			groupItem.ChildrenList = groupSellerList
+			if len(groupSellerList) > 0 {
+				resp = append(resp, groupItem)
+			}
+		}
+
+		//分组为0的销售（直属部门）
+		departmentSellerList, err := system.GetDepartmentGroupSysUserList(departmentId, 0, roleCodeTypeStr)
+		if err != nil {
+			br.Msg = "获取销售失败"
+			br.ErrMsg = "获取销售失败,Err:" + err.Error()
+			return
+		}
+		if len(departmentSellerList) > 0 {
+			tmpDepartmentGroupSeller := make([]company.DepartmentGroupSellers, 0)
+			for _, seller := range departmentSellerList {
+				sellerItem := company.DepartmentGroupSellers{
+					AdminId: fmt.Sprint(seller.AdminId),
+					//AdminName string `description:"系统用户名称"`
+					RealName:     seller.RealName,
+					Authority:    seller.Authority,
+					RoleTypeCode: seller.RoleTypeCode,
+				}
+				tmpDepartmentGroupSeller = append(tmpDepartmentGroupSeller, sellerItem)
+			}
+			tmpDepartmentGroupSeller = sortDepartmentGroupSellers(tmpDepartmentGroupSeller)
+			resp = append(resp, tmpDepartmentGroupSeller...)
+		}
 	} else {
-		groupId = 61
-	}
-	subAdmins, err := system.GetAdminByGroupId(groupId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
-		br.Msg = "获取销售失败"
-		br.ErrMsg = "获取销售失败,Err:" + err.Error()
-		return
-	}
+		groupId := 0
+		if utils.RunMode == "release" {
+			groupId = 37
+		} else {
+			groupId = 61
+		}
+		subAdmins, err := system.GetAdminByGroupId(groupId)
+		if err != nil && err.Error() != utils.ErrNoRow() {
+			br.Msg = "获取销售失败"
+			br.ErrMsg = "获取销售失败,Err:" + err.Error()
+			return
+		}
 
-	resp := make([]company.DepartmentGroupSellers, 0)
-	for _, seller := range subAdmins {
-		sellerItem := company.DepartmentGroupSellers{
-			AdminId: fmt.Sprint(seller.AdminId),
-			//AdminName string `description:"系统用户名称"`
-			RealName:     seller.RealName,
-			Authority:    seller.Authority,
-			RoleTypeCode: seller.RoleTypeCode,
+		for _, seller := range subAdmins {
+			sellerItem := company.DepartmentGroupSellers{
+				AdminId: fmt.Sprint(seller.AdminId),
+				//AdminName string `description:"系统用户名称"`
+				RealName:     seller.RealName,
+				Authority:    seller.Authority,
+				RoleTypeCode: seller.RoleTypeCode,
+			}
+			resp = append(resp, sellerItem)
 		}
-		resp = append(resp, sellerItem)
 	}
 
 	br.Ret = 200
@@ -3344,3 +3455,1716 @@ func (this *CompanySellerController) CheckListRai() {
 		List: list,
 	}
 }
+
+// ShareCheckList2
+// @Title 获取组长/组员下销售（根据部门、分组）
+// @Description 获取组长/组员下销售（根据部门、分组）接口
+// @Param   AllSeller   query   bool  true       "是否获取部门所有的销售信息"
+// @Param   Status   query   int  true       "客户状态 1：流失 0：非流失"
+// @Param   AllEnabled   query   bool  true       "是否获取包含禁用的用户"
+// @Success 200 {object} company.DepartmentGroupSellersResp
+// @router /seller/check/Sharelist2 [get]
+func (this *CompanySellerController) ShareCheckList2() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+	roleCodeTypeStr := ``
+	productId := services.GetProductId(sysUser.RoleTypeCode)
+	switch productId {
+	case 1:
+		roleCodeTypeStr = `"` + utils.ROLE_TYPE_CODE_FICC_SELLER + `","` + utils.ROLE_TYPE_CODE_FICC_GROUP + `","` + utils.ROLE_TYPE_CODE_FICC_TEAM + `"`
+	case 2:
+		roleCodeTypeStr = `"` + utils.ROLE_TYPE_CODE_RAI_SELLER + `","` + utils.ROLE_TYPE_CODE_RAI_GROUP + `"`
+	}
+
+	// ficc管理员，不要只查销售
+	if sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_FICC_ADMIN {
+		roleCodeTypeStr = ``
+	} else if sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_RAI_ADMIN {
+		// 权益管理员，查看所有权益的账号
+		roleCodeTypeStr = `"` + utils.ROLE_TYPE_CODE_RAI_SELLER + `","` + utils.ROLE_TYPE_CODE_RAI_GROUP + `","` + utils.ROLE_TYPE_CODE_RAI_RESEARCHR + `","` + utils.ROLE_TYPE_CODE_RAI_ADMIN + `"`
+	}
+
+	status, _ := this.GetInt("Status", 0)
+	getAllEnabled, _ := this.GetBool("AllEnabled", false)
+	enabled := 1       //默认只获取正常状态的用户
+	if getAllEnabled { //获取所有状态的用户
+		enabled = -1
+	}
+	resp := make([]company.DepartmentGroupSellers, 0)
+
+	list := make([]company.DepartmentGroupSellers, 0)
+	if productId != 2 {
+		//超管看部门、小组、销售
+		if sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_ADMIN {
+			departmentList, err := system.GetDepartmentList()
+			if err != nil {
+				br.Msg = "获取失败"
+				br.ErrMsg = "获取部门失败,Err:" + err.Error()
+				return
+			}
+			for _, department := range departmentList {
+				departmentGroupSellerList := make([]company.DepartmentGroupSellers, 0)
+				item := company.DepartmentGroupSellers{
+					AdminId: fmt.Sprint("department_", department.DepartmentId),
+					//AdminName string `description:"系统用户名称"`
+					RealName:     department.DepartmentName,
+					ChildrenList: departmentGroupSellerList,
+				}
+
+				groupList, err := system.GetSysGroupByDepartmentId(department.DepartmentId)
+				if err != nil {
+					br.Msg = "获取失败"
+					br.ErrMsg = "获取分组失败,Err:" + err.Error()
+					return
+				}
+				for _, group := range groupList {
+					groupSellerList := make([]company.DepartmentGroupSellers, 0)
+					groupItem := company.DepartmentGroupSellers{
+						AdminId: fmt.Sprint("group_", group.DepartmentId),
+						//AdminName string `description:"系统用户名称"`
+						RealName:     group.GroupName,
+						ChildrenList: groupSellerList,
+					}
+					teamList, err := system.GetSysTeamByDepartmentId(group.GroupId)
+					if err != nil {
+						br.Msg = "获取小组失败"
+						br.ErrMsg = "获取小组失败,Err:" + err.Error()
+						return
+					}
+					for _, team := range teamList {
+						teamSellerList := make([]company.DepartmentGroupSellers, 0)
+						teamItem := company.DepartmentGroupSellers{
+							AdminId: fmt.Sprint("team_", team.GroupId),
+							//AdminName string `description:"系统用户名称"`
+							RealName:     team.GroupName,
+							ChildrenList: teamSellerList,
+						}
+						sellerList, err := system.GetTeamSysUserList(team.GroupId, enabled)
+						if err != nil {
+							br.Msg = "获取销售失败"
+							br.ErrMsg = "获取销售失败,Err:" + err.Error()
+							return
+						}
+						for _, seller := range sellerList {
+							sellerItem := company.DepartmentGroupSellers{
+								AdminId: fmt.Sprint(seller.AdminId),
+								//AdminName string `description:"系统用户名称"`
+								RealName:     seller.RealName,
+								Authority:    seller.Authority,
+								RoleTypeCode: seller.RoleTypeCode,
+							}
+							//fmt.Println("seller.RealName:", seller.RealName)
+							teamSellerList = append(teamSellerList, sellerItem)
+						}
+						teamSellerList = sortDepartmentGroupSellers(teamSellerList)
+						teamItem.ChildrenList = teamSellerList
+						if len(teamSellerList) > 0 {
+							groupSellerList = append(groupSellerList, teamItem)
+						}
+					}
+					//分组为0的销售（直属分组）
+					groupTeamSellerList, err := system.GetGrooupsysUserList(group.GroupId, roleCodeTypeStr, enabled)
+					if err != nil {
+						br.Msg = "获取销售失败"
+						br.ErrMsg = "获取销售失败,Err:" + err.Error()
+						return
+					}
+					if len(groupTeamSellerList) > 0 {
+						tmpDepartmentGroupSellersList := make([]company.DepartmentGroupSellers, 0)
+						for _, seller := range groupTeamSellerList {
+							sellerItem := company.DepartmentGroupSellers{
+								AdminId: fmt.Sprint(seller.AdminId),
+								//AdminName string `description:"系统用户名称"`
+								RealName:     seller.RealName,
+								Authority:    seller.Authority,
+								RoleTypeCode: seller.RoleTypeCode,
+							}
+							tmpDepartmentGroupSellersList = append(tmpDepartmentGroupSellersList, sellerItem)
+						}
+						//排个序
+						tmpDepartmentGroupSellersList = sortDepartmentGroupSellers(tmpDepartmentGroupSellersList)
+						groupSellerList = append(groupSellerList, tmpDepartmentGroupSellersList...)
+					}
+
+					//groupItem.ChildrenList = groupSellerList
+					//if len(groupSellerList) > 0 {
+					//	list = append(list, item)
+					//}
+
+					//sellerList, err := system.GetGroupSysUserList(group.DepartmentId)
+					//if err != nil {
+					//	br.Msg = "获取销售失败"
+					//	br.ErrMsg = "获取销售失败,Err:" + err.Error()
+					//	return
+					//}
+					//for _, seller := range sellerList {
+					//	sellerItem := company.DepartmentGroupSellers{
+					//		AdminId: fmt.Sprint(seller.AdminId),
+					//		//AdminName string `description:"系统用户名称"`
+					//		RealName:     seller.RealName,
+					//		Authority:    seller.Authority,
+					//		RoleTypeCode: seller.RoleTypeCode,
+					//	}
+					//	groupSellerList = append(groupSellerList, sellerItem)
+					//}
+					//groupSellerList = sortDepartmentGroupSellers(groupSellerList)
+					groupItem.ChildrenList = groupSellerList
+					if len(groupSellerList) > 0 {
+						departmentGroupSellerList = append(departmentGroupSellerList, groupItem)
+					}
+				}
+
+				//分组为0的销售（直属部门）
+				departmentSellerList, err := system.GetDepartmentGroupSysUserList(department.DepartmentId, 0, roleCodeTypeStr)
+				if err != nil {
+					br.Msg = "获取销售失败"
+					br.ErrMsg = "获取销售失败,Err:" + err.Error()
+					return
+				}
+				if len(departmentSellerList) > 0 {
+					tmpDepartmentGroupSellersList := make([]company.DepartmentGroupSellers, 0)
+					for _, seller := range departmentSellerList {
+						sellerItem := company.DepartmentGroupSellers{
+							AdminId: fmt.Sprint(seller.AdminId),
+							//AdminName string `description:"系统用户名称"`
+							RealName:     seller.RealName,
+							Authority:    seller.Authority,
+							RoleTypeCode: seller.RoleTypeCode,
+						}
+						tmpDepartmentGroupSellersList = append(tmpDepartmentGroupSellersList, sellerItem)
+					}
+					//排个序
+					tmpDepartmentGroupSellersList = sortDepartmentGroupSellers(tmpDepartmentGroupSellersList)
+					departmentGroupSellerList = append(departmentGroupSellerList, tmpDepartmentGroupSellersList...)
+				}
+
+				item.ChildrenList = departmentGroupSellerList
+				if len(departmentGroupSellerList) > 0 {
+					list = append(list, item)
+				}
+			}
+		} else if sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_FICC_TEAM || sysUser.Authority == 4 {
+			//销售组长看销售
+			if status == 0 {
+				directorId := sysUser.GroupId
+				fmt.Println("directorId:", directorId)
+				groupList, err := system.GetSysGroupByDirectorId(directorId)
+				if err != nil {
+					br.Msg = "获取失败"
+					br.ErrMsg = "获取分组失败,Err:" + err.Error()
+					return
+				}
+				for _, group := range groupList {
+					groupSellerList := make([]company.DepartmentGroupSellers, 0)
+					groupItem := company.DepartmentGroupSellers{
+						AdminId: fmt.Sprint("group_", group.DepartmentId),
+						//AdminName string `description:"系统用户名称"`
+						RealName:     group.GroupName,
+						ChildrenList: groupSellerList,
+					}
+					teamList, err := system.GetSysTeamByDepartmentId(group.GroupId)
+					if err != nil {
+						br.Msg = "获取小组失败"
+						br.ErrMsg = "获取小组失败,Err:" + err.Error()
+						return
+					}
+					for _, team := range teamList {
+						teamSellerList := make([]company.DepartmentGroupSellers, 0)
+						teamItem := company.DepartmentGroupSellers{
+							AdminId: fmt.Sprint("team_", team.GroupId),
+							//AdminName string `description:"系统用户名称"`
+							RealName:     team.GroupName,
+							ChildrenList: teamSellerList,
+						}
+						sellerList, err := system.GetTeamSysUserList(team.GroupId, enabled)
+						if err != nil {
+							br.Msg = "获取销售失败"
+							br.ErrMsg = "获取销售失败,Err:" + err.Error()
+							return
+						}
+						for _, seller := range sellerList {
+							sellerItem := company.DepartmentGroupSellers{
+								AdminId: fmt.Sprint(seller.AdminId),
+								//AdminName string `description:"系统用户名称"`
+								RealName:     seller.RealName,
+								Authority:    seller.Authority,
+								RoleTypeCode: seller.RoleTypeCode,
+							}
+							//fmt.Println("seller.RealName:", seller.RealName)
+							teamSellerList = append(teamSellerList, sellerItem)
+						}
+						teamSellerList = sortDepartmentGroupSellers(teamSellerList)
+						teamItem.ChildrenList = teamSellerList
+						if len(teamSellerList) > 0 {
+							groupSellerList = append(groupSellerList, teamItem)
+						}
+					}
+					//分组为0的销售（直属分组）
+					groupTeamSellerList, err := system.GetGrooupsysUserList(group.GroupId, roleCodeTypeStr, enabled)
+					if err != nil {
+						br.Msg = "获取销售失败"
+						br.ErrMsg = "获取销售失败,Err:" + err.Error()
+						return
+					}
+					if len(groupTeamSellerList) > 0 {
+						tmpDepartmentGroupSellersList := make([]company.DepartmentGroupSellers, 0)
+						for _, seller := range groupTeamSellerList {
+							sellerItem := company.DepartmentGroupSellers{
+								AdminId: fmt.Sprint(seller.AdminId),
+								//AdminName string `description:"系统用户名称"`
+								RealName:     seller.RealName,
+								Authority:    seller.Authority,
+								RoleTypeCode: seller.RoleTypeCode,
+							}
+							tmpDepartmentGroupSellersList = append(tmpDepartmentGroupSellersList, sellerItem)
+						}
+						//排个序
+						tmpDepartmentGroupSellersList = sortDepartmentGroupSellers(tmpDepartmentGroupSellersList)
+						groupSellerList = append(groupSellerList, tmpDepartmentGroupSellersList...)
+					}
+
+					groupItem.ChildrenList = groupSellerList
+					if len(groupSellerList) > 0 {
+						list = append(list, groupItem)
+					}
+				}
+			} else {
+				departmentStr := `1,2`
+				departmentList, err := system.GetDepartmentListByIds(departmentStr)
+				if err != nil {
+					br.Msg = "获取失败"
+					br.ErrMsg = "获取部门失败,Err:" + err.Error()
+					return
+				}
+				for _, department := range departmentList {
+					departmentGroupSellerList := make([]company.DepartmentGroupSellers, 0)
+					item := company.DepartmentGroupSellers{
+						AdminId: fmt.Sprint("department_", department.DepartmentId),
+						//AdminName string `description:"系统用户名称"`
+						RealName:     department.DepartmentName,
+						ChildrenList: departmentGroupSellerList,
+					}
+
+					groupList, err := system.GetSysGroupByDepartmentId(department.DepartmentId)
+					if err != nil {
+						br.Msg = "获取失败"
+						br.ErrMsg = "获取分组失败,Err:" + err.Error()
+						return
+					}
+					for _, group := range groupList {
+						groupSellerList := make([]company.DepartmentGroupSellers, 0)
+						groupItem := company.DepartmentGroupSellers{
+							AdminId: fmt.Sprint("group_", group.DepartmentId),
+							//AdminName string `description:"系统用户名称"`
+							RealName:     group.GroupName,
+							ChildrenList: groupSellerList,
+						}
+						teamList, err := system.GetSysTeamByDepartmentId(group.GroupId)
+						if err != nil {
+							br.Msg = "获取小组失败"
+							br.ErrMsg = "获取小组失败,Err:" + err.Error()
+							return
+						}
+						for _, team := range teamList {
+							teamSellerList := make([]company.DepartmentGroupSellers, 0)
+							teamItem := company.DepartmentGroupSellers{
+								AdminId: fmt.Sprint("team_", team.GroupId),
+								//AdminName string `description:"系统用户名称"`
+								RealName:     team.GroupName,
+								ChildrenList: teamSellerList,
+							}
+							sellerList, err := system.GetTeamSysUserList(team.GroupId, enabled)
+							if err != nil {
+								br.Msg = "获取销售失败"
+								br.ErrMsg = "获取销售失败,Err:" + err.Error()
+								return
+							}
+							for _, seller := range sellerList {
+								sellerItem := company.DepartmentGroupSellers{
+									AdminId: fmt.Sprint(seller.AdminId),
+									//AdminName string `description:"系统用户名称"`
+									RealName:     seller.RealName,
+									Authority:    seller.Authority,
+									RoleTypeCode: seller.RoleTypeCode,
+								}
+								//fmt.Println("seller.RealName:", seller.RealName)
+								teamSellerList = append(teamSellerList, sellerItem)
+							}
+							teamSellerList = sortDepartmentGroupSellers(teamSellerList)
+							teamItem.ChildrenList = teamSellerList
+							if len(teamSellerList) > 0 {
+								groupSellerList = append(groupSellerList, teamItem)
+							}
+						}
+						//分组为0的人，不光是销售（直属分组）
+						groupTeamSellerList, err := system.GetGroupSysUserList(group.GroupId)
+						if err != nil {
+							br.Msg = "获取销售失败"
+							br.ErrMsg = "获取销售失败,Err:" + err.Error()
+							return
+						}
+						if len(groupTeamSellerList) > 0 {
+							tmpDepartmentGroupSellersList := make([]company.DepartmentGroupSellers, 0)
+							for _, seller := range groupTeamSellerList {
+								sellerItem := company.DepartmentGroupSellers{
+									AdminId: fmt.Sprint(seller.AdminId),
+									//AdminName string `description:"系统用户名称"`
+									RealName:     seller.RealName,
+									Authority:    seller.Authority,
+									RoleTypeCode: seller.RoleTypeCode,
+								}
+								tmpDepartmentGroupSellersList = append(tmpDepartmentGroupSellersList, sellerItem)
+							}
+							//排个序
+							tmpDepartmentGroupSellersList = sortDepartmentGroupSellers(tmpDepartmentGroupSellersList)
+							groupSellerList = append(groupSellerList, tmpDepartmentGroupSellersList...)
+						}
+
+						//groupItem.ChildrenList = groupSellerList
+						//if len(groupSellerList) > 0 {
+						//	list = append(list, item)
+						//}
+
+						//sellerList, err := system.GetGroupSysUserList(group.DepartmentId)
+						//if err != nil {
+						//	br.Msg = "获取销售失败"
+						//	br.ErrMsg = "获取销售失败,Err:" + err.Error()
+						//	return
+						//}
+						//for _, seller := range sellerList {
+						//	sellerItem := company.DepartmentGroupSellers{
+						//		AdminId: fmt.Sprint(seller.AdminId),
+						//		//AdminName string `description:"系统用户名称"`
+						//		RealName:     seller.RealName,
+						//		Authority:    seller.Authority,
+						//		RoleTypeCode: seller.RoleTypeCode,
+						//	}
+						//	groupSellerList = append(groupSellerList, sellerItem)
+						//}
+						//groupSellerList = sortDepartmentGroupSellers(groupSellerList)
+						groupItem.ChildrenList = groupSellerList
+						if len(groupSellerList) > 0 {
+							departmentGroupSellerList = append(departmentGroupSellerList, groupItem)
+						}
+					}
+
+					//分组为0的人，不光是销售（直属部门）
+					departmentSellerList, err := system.GetDepartmentGroupSysUserList(department.DepartmentId, 0, "")
+					if err != nil {
+						br.Msg = "获取销售失败"
+						br.ErrMsg = "获取销售失败,Err:" + err.Error()
+						return
+					}
+					if len(departmentSellerList) > 0 {
+						tmpDepartmentGroupSellersList := make([]company.DepartmentGroupSellers, 0)
+						for _, seller := range departmentSellerList {
+							sellerItem := company.DepartmentGroupSellers{
+								AdminId: fmt.Sprint(seller.AdminId),
+								//AdminName string `description:"系统用户名称"`
+								RealName:     seller.RealName,
+								Authority:    seller.Authority,
+								RoleTypeCode: seller.RoleTypeCode,
+							}
+							tmpDepartmentGroupSellersList = append(tmpDepartmentGroupSellersList, sellerItem)
+						}
+						//排个序
+						tmpDepartmentGroupSellersList = sortDepartmentGroupSellers(tmpDepartmentGroupSellersList)
+						departmentGroupSellerList = append(departmentGroupSellerList, tmpDepartmentGroupSellersList...)
+					}
+
+					item.ChildrenList = departmentGroupSellerList
+					if len(departmentGroupSellerList) > 0 {
+						list = append(list, item)
+					}
+				}
+			}
+		} else if sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_COMPLIANCE || sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_FINANCE || sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_FICC_ADMIN { //合规或财务或ficc管理员
+			departmentStr := `2,5,7` //合规
+			switch sysUser.RoleTypeCode {
+			case utils.ROLE_TYPE_CODE_FINANCE: //财务
+				departmentStr = `2,5,8`
+			case utils.ROLE_TYPE_CODE_FICC_ADMIN: //ficc管理员
+				departmentStr = utils.GetFiccAdminDepartmentIds()
+			}
+			departmentList, err := system.GetDepartmentListByIds(departmentStr)
+			if err != nil {
+				br.Msg = "获取失败"
+				br.ErrMsg = "获取部门失败,Err:" + err.Error()
+				return
+			}
+			for _, department := range departmentList {
+				fmt.Println(department)
+				departmentGroupSellerList := make([]company.DepartmentGroupSellers, 0)
+				item := company.DepartmentGroupSellers{
+					AdminId: fmt.Sprint("department_", department.DepartmentId),
+					//AdminName string `description:"系统用户名称"`
+					RealName:     department.DepartmentName,
+					ChildrenList: departmentGroupSellerList,
+				}
+
+				groupList, err := system.GetSysGroupByDepartmentId(department.DepartmentId)
+				if err != nil {
+					br.Msg = "获取失败"
+					br.ErrMsg = "获取分组失败,Err:" + err.Error()
+					return
+				}
+				for _, group := range groupList {
+					groupSellerList := make([]company.DepartmentGroupSellers, 0)
+					groupItem := company.DepartmentGroupSellers{
+						AdminId: fmt.Sprint("group_", group.DepartmentId),
+						//AdminName string `description:"系统用户名称"`
+						RealName:     group.GroupName,
+						ChildrenList: groupSellerList,
+					}
+					teamList, err := system.GetSysTeamByDepartmentId(group.GroupId)
+					if err != nil {
+						br.Msg = "获取小组失败"
+						br.ErrMsg = "获取小组失败,Err:" + err.Error()
+						return
+					}
+					for _, team := range teamList {
+						teamSellerList := make([]company.DepartmentGroupSellers, 0)
+						teamItem := company.DepartmentGroupSellers{
+							AdminId: fmt.Sprint("team_", team.GroupId),
+							//AdminName string `description:"系统用户名称"`
+							RealName:     team.GroupName,
+							ChildrenList: teamSellerList,
+						}
+						sellerList, err := system.GetTeamSysUserList(team.GroupId, enabled)
+						if err != nil {
+							br.Msg = "获取销售失败"
+							br.ErrMsg = "获取销售失败,Err:" + err.Error()
+							return
+						}
+						for _, seller := range sellerList {
+							sellerItem := company.DepartmentGroupSellers{
+								AdminId: fmt.Sprint(seller.AdminId),
+								//AdminName string `description:"系统用户名称"`
+								RealName:     seller.RealName,
+								Authority:    seller.Authority,
+								RoleTypeCode: seller.RoleTypeCode,
+							}
+							//fmt.Println("seller.RealName:", seller.RealName)
+							teamSellerList = append(teamSellerList, sellerItem)
+						}
+						teamSellerList = sortDepartmentGroupSellers(teamSellerList)
+						teamItem.ChildrenList = teamSellerList
+						if len(teamSellerList) > 0 {
+							groupSellerList = append(groupSellerList, teamItem)
+						}
+					}
+					//分组为0的销售（直属分组）
+					groupTeamSellerList, err := system.GetGrooupsysUserList(group.GroupId, roleCodeTypeStr, enabled)
+					if err != nil {
+						br.Msg = "获取销售失败"
+						br.ErrMsg = "获取销售失败,Err:" + err.Error()
+						return
+					}
+					if len(groupTeamSellerList) > 0 {
+						tmpDepartmentGroupSellersList := make([]company.DepartmentGroupSellers, 0)
+						for _, seller := range groupTeamSellerList {
+							sellerItem := company.DepartmentGroupSellers{
+								AdminId: fmt.Sprint(seller.AdminId),
+								//AdminName string `description:"系统用户名称"`
+								RealName:     seller.RealName,
+								Authority:    seller.Authority,
+								RoleTypeCode: seller.RoleTypeCode,
+							}
+							tmpDepartmentGroupSellersList = append(tmpDepartmentGroupSellersList, sellerItem)
+						}
+						//排个序
+						tmpDepartmentGroupSellersList = sortDepartmentGroupSellers(tmpDepartmentGroupSellersList)
+						groupSellerList = append(groupSellerList, tmpDepartmentGroupSellersList...)
+					}
+
+					//groupItem.ChildrenList = groupSellerList
+					//if len(groupSellerList) > 0 {
+					//	list = append(list, item)
+					//}
+
+					//sellerList, err := system.GetGroupSysUserList(group.DepartmentId)
+					//if err != nil {
+					//	br.Msg = "获取销售失败"
+					//	br.ErrMsg = "获取销售失败,Err:" + err.Error()
+					//	return
+					//}
+					//for _, seller := range sellerList {
+					//	sellerItem := company.DepartmentGroupSellers{
+					//		AdminId: fmt.Sprint(seller.AdminId),
+					//		//AdminName string `description:"系统用户名称"`
+					//		RealName:     seller.RealName,
+					//		Authority:    seller.Authority,
+					//		RoleTypeCode: seller.RoleTypeCode,
+					//	}
+					//	groupSellerList = append(groupSellerList, sellerItem)
+					//}
+					//groupSellerList = sortDepartmentGroupSellers(groupSellerList)
+					groupItem.ChildrenList = groupSellerList
+					if len(groupSellerList) > 0 {
+						departmentGroupSellerList = append(departmentGroupSellerList, groupItem)
+					}
+				}
+
+				//分组为0的销售（直属部门）
+				departmentSellerList, err := system.GetDepartmentGroupSysUserList(department.DepartmentId, 0, roleCodeTypeStr)
+				if err != nil {
+					br.Msg = "获取销售失败"
+					br.ErrMsg = "获取销售失败,Err:" + err.Error()
+					return
+				}
+				if len(departmentSellerList) > 0 {
+					tmpDepartmentGroupSellerList := make([]company.DepartmentGroupSellers, 0)
+					for _, seller := range departmentSellerList {
+						sellerItem := company.DepartmentGroupSellers{
+							AdminId: fmt.Sprint(seller.AdminId),
+							//AdminName string `description:"系统用户名称"`
+							RealName:     seller.RealName,
+							Authority:    seller.Authority,
+							RoleTypeCode: seller.RoleTypeCode,
+						}
+						tmpDepartmentGroupSellerList = append(tmpDepartmentGroupSellerList, sellerItem)
+					}
+					//排个序
+					tmpDepartmentGroupSellerList = sortDepartmentGroupSellers(tmpDepartmentGroupSellerList)
+					departmentGroupSellerList = append(departmentGroupSellerList, tmpDepartmentGroupSellerList...)
+				}
+
+				item.ChildrenList = departmentGroupSellerList
+				if len(departmentGroupSellerList) > 0 {
+					list = append(list, item)
+				}
+			}
+		} else if sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_RAI_ADMIN || sysUser.Authority == 1 {
+			//部门管理员看小组、销售
+			departmentId := sysUser.DepartmentId
+			switch sysUser.RoleTypeCode {
+			case utils.ROLE_TYPE_CODE_RAI_ADMIN: //权益管理员
+				departmentId = 5
+			case utils.ROLE_TYPE_CODE_FICC_ADMIN: //ficc管理员
+				departmentId = 2
+			}
+			groupList, err := system.GetSysGroupByDepartmentId(departmentId)
+			if err != nil {
+				br.Msg = "获取失败"
+				br.ErrMsg = "获取分组失败,Err:" + err.Error()
+				return
+			}
+			for _, group := range groupList {
+				groupSellerList := make([]company.DepartmentGroupSellers, 0)
+				groupItem := company.DepartmentGroupSellers{
+					AdminId: fmt.Sprint("group_", group.DepartmentId),
+					//AdminName string `description:"系统用户名称"`
+					RealName:     group.GroupName,
+					ChildrenList: groupSellerList,
+				}
+				teamList, err := system.GetSysTeamByDepartmentId(group.GroupId)
+				if err != nil {
+					br.Msg = "获取小组失败"
+					br.ErrMsg = "获取小组失败,Err:" + err.Error()
+					return
+				}
+				for _, team := range teamList {
+					teamSellerList := make([]company.DepartmentGroupSellers, 0)
+					teamItem := company.DepartmentGroupSellers{
+						AdminId: fmt.Sprint("team_", team.GroupId),
+						//AdminName string `description:"系统用户名称"`
+						RealName:     team.GroupName,
+						ChildrenList: teamSellerList,
+					}
+					sellerList, err := system.GetTeamSysUserList(team.GroupId, enabled)
+					if err != nil {
+						br.Msg = "获取销售失败"
+						br.ErrMsg = "获取销售失败,Err:" + err.Error()
+						return
+					}
+					for _, seller := range sellerList {
+						sellerItem := company.DepartmentGroupSellers{
+							AdminId: fmt.Sprint(seller.AdminId),
+							//AdminName string `description:"系统用户名称"`
+							RealName:     seller.RealName,
+							Authority:    seller.Authority,
+							RoleTypeCode: seller.RoleTypeCode,
+						}
+						//fmt.Println("seller.RealName:", seller.RealName)
+						teamSellerList = append(teamSellerList, sellerItem)
+					}
+					teamSellerList = sortDepartmentGroupSellers(teamSellerList)
+					teamItem.ChildrenList = teamSellerList
+					if len(teamSellerList) > 0 {
+						groupSellerList = append(groupSellerList, teamItem)
+					}
+				}
+				//分组为0的销售（直属分组）
+				groupTeamSellerList, err := system.GetGrooupsysUserList(group.GroupId, roleCodeTypeStr, enabled)
+				if err != nil {
+					br.Msg = "获取销售失败"
+					br.ErrMsg = "获取销售失败,Err:" + err.Error()
+					return
+				}
+				if len(groupTeamSellerList) > 0 {
+					tmpDepartmentGroupSellersList := make([]company.DepartmentGroupSellers, 0)
+					for _, seller := range groupTeamSellerList {
+						sellerItem := company.DepartmentGroupSellers{
+							AdminId: fmt.Sprint(seller.AdminId),
+							//AdminName string `description:"系统用户名称"`
+							RealName:     seller.RealName,
+							Authority:    seller.Authority,
+							RoleTypeCode: seller.RoleTypeCode,
+						}
+						tmpDepartmentGroupSellersList = append(tmpDepartmentGroupSellersList, sellerItem)
+					}
+					//排个序
+					tmpDepartmentGroupSellersList = sortDepartmentGroupSellers(tmpDepartmentGroupSellersList)
+					groupSellerList = append(groupSellerList, tmpDepartmentGroupSellersList...)
+				}
+
+				//groupItem.ChildrenList = groupSellerList
+				//if len(groupSellerList) > 0 {
+				//	list = append(list, item)
+				//}
+
+				//sellerList, err := system.GetGroupSysUserList(group.DepartmentId)
+				//if err != nil {
+				//	br.Msg = "获取销售失败"
+				//	br.ErrMsg = "获取销售失败,Err:" + err.Error()
+				//	return
+				//}
+				//for _, seller := range sellerList {
+				//	sellerItem := company.DepartmentGroupSellers{
+				//		AdminId: fmt.Sprint(seller.AdminId),
+				//		//AdminName string `description:"系统用户名称"`
+				//		RealName:     seller.RealName,
+				//		Authority:    seller.Authority,
+				//		RoleTypeCode: seller.RoleTypeCode,
+				//	}
+				//	groupSellerList = append(groupSellerList, sellerItem)
+				//}
+				//groupSellerList = sortDepartmentGroupSellers(groupSellerList)
+				groupItem.ChildrenList = groupSellerList
+				if len(groupSellerList) > 0 {
+					list = append(list, groupItem)
+				}
+			}
+
+			//分组为0的销售（直属部门）
+			departmentSellerList, err := system.GetDepartmentGroupSysUserList(departmentId, 0, roleCodeTypeStr)
+			if err != nil {
+				br.Msg = "获取销售失败"
+				br.ErrMsg = "获取销售失败,Err:" + err.Error()
+				return
+			}
+			if len(departmentSellerList) > 0 {
+				tmpDepartmentGroupSeller := make([]company.DepartmentGroupSellers, 0)
+				for _, seller := range departmentSellerList {
+					sellerItem := company.DepartmentGroupSellers{
+						AdminId: fmt.Sprint(seller.AdminId),
+						//AdminName string `description:"系统用户名称"`
+						RealName:     seller.RealName,
+						Authority:    seller.Authority,
+						RoleTypeCode: seller.RoleTypeCode,
+					}
+					tmpDepartmentGroupSeller = append(tmpDepartmentGroupSeller, sellerItem)
+				}
+				tmpDepartmentGroupSeller = sortDepartmentGroupSellers(tmpDepartmentGroupSeller)
+				list = append(list, tmpDepartmentGroupSeller...)
+			}
+		} else if sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_RAI_GROUP || (sysUser.Authority == 2 && sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_FICC_GROUP) {
+			// 权益组长看小组
+			if status == 0 {
+				sellerList, err := system.GetTeamSysUserList(sysUser.GroupId, enabled)
+				if err != nil {
+					br.Msg = "获取销售失败"
+					br.ErrMsg = "获取销售失败,Err:" + err.Error()
+					return
+				}
+				for _, seller := range sellerList {
+					sellerItem := company.DepartmentGroupSellers{
+						AdminId: fmt.Sprint(seller.AdminId),
+						//AdminName string `description:"系统用户名称"`
+						RealName:     seller.RealName,
+						Authority:    seller.Authority,
+						RoleTypeCode: seller.RoleTypeCode,
+					}
+					//fmt.Println("seller.RealName:", seller.RealName)
+					list = append(list, sellerItem)
+				}
+				list = sortDepartmentGroupSellers(list)
+
+				//正常来说没有所有人都应该在某个小组下，要不就是小组名为 无 的小组
+				//分组为0的销售（直属分组）
+				//groupTeamSellerList, err := system.GetGrooupsysUserList(sysUser.GroupId, 0, roleCodeTypeStr)
+				//if err != nil {
+				//	br.Msg = "获取销售失败"
+				//	br.ErrMsg = "获取销售失败,Err:" + err.Error()
+				//	return
+				//}
+				//if len(groupTeamSellerList) > 0 {
+				//	tmpDepartmentGroupSellersList := make([]company.DepartmentGroupSellers, 0)
+				//	for _, seller := range groupTeamSellerList {
+				//		sellerItem := company.DepartmentGroupSellers{
+				//			AdminId: fmt.Sprint(seller.AdminId),
+				//			//AdminName string `description:"系统用户名称"`
+				//			RealName:     seller.RealName,
+				//			Authority:    seller.Authority,
+				//			RoleTypeCode: seller.RoleTypeCode,
+				//		}
+				//		tmpDepartmentGroupSellersList = append(tmpDepartmentGroupSellersList, sellerItem)
+				//	}
+				//	//排个序
+				//	tmpDepartmentGroupSellersList = sortDepartmentGroupSellers(tmpDepartmentGroupSellersList)
+				//	list = append(list, tmpDepartmentGroupSellersList...)
+				//}
+				//sellerList, err := system.GetDepartmentGroupSysUserList(sysUser.DepartmentId, sysUser.GroupId, roleCodeTypeStr)
+				//if err != nil {
+				//	br.Msg = "获取销售失败"
+				//	br.ErrMsg = "获取销售失败,Err:" + err.Error()
+				//	return
+				//}
+				//for _, seller := range sellerList {
+				//	sellerItem := company.DepartmentGroupSellers{
+				//		AdminId: fmt.Sprint(seller.AdminId),
+				//		//AdminName string `description:"系统用户名称"`
+				//		RealName:     seller.RealName,
+				//		Authority:    seller.Authority,
+				//		RoleTypeCode: seller.RoleTypeCode,
+				//	}
+				//	list = append(list, sellerItem)
+				//	list = sortDepartmentGroupSellers(list)
+				//}
+			} else {
+				departmentId := 5
+				groupList, err := system.GetSysGroupByDepartmentId(departmentId)
+				if err != nil {
+					br.Msg = "获取失败"
+					br.ErrMsg = "获取分组失败,Err:" + err.Error()
+					return
+				}
+				for _, group := range groupList {
+					groupSellerList := make([]company.DepartmentGroupSellers, 0)
+					groupItem := company.DepartmentGroupSellers{
+						AdminId: fmt.Sprint("group_", group.DepartmentId),
+						//AdminName string `description:"系统用户名称"`
+						RealName:     group.GroupName,
+						ChildrenList: groupSellerList,
+					}
+					teamList, err := system.GetSysTeamByDepartmentId(group.GroupId)
+					if err != nil {
+						br.Msg = "获取小组失败"
+						br.ErrMsg = "获取小组失败,Err:" + err.Error()
+						return
+					}
+					for _, team := range teamList {
+						teamSellerList := make([]company.DepartmentGroupSellers, 0)
+						teamItem := company.DepartmentGroupSellers{
+							AdminId: fmt.Sprint("team_", team.GroupId),
+							//AdminName string `description:"系统用户名称"`
+							RealName:     team.GroupName,
+							ChildrenList: teamSellerList,
+						}
+						sellerList, err := system.GetTeamSysUserList(team.GroupId, enabled)
+						if err != nil {
+							br.Msg = "获取销售失败"
+							br.ErrMsg = "获取销售失败,Err:" + err.Error()
+							return
+						}
+						for _, seller := range sellerList {
+							sellerItem := company.DepartmentGroupSellers{
+								AdminId: fmt.Sprint(seller.AdminId),
+								//AdminName string `description:"系统用户名称"`
+								RealName:     seller.RealName,
+								Authority:    seller.Authority,
+								RoleTypeCode: seller.RoleTypeCode,
+							}
+							//fmt.Println("seller.RealName:", seller.RealName)
+							teamSellerList = append(teamSellerList, sellerItem)
+						}
+						teamSellerList = sortDepartmentGroupSellers(teamSellerList)
+						teamItem.ChildrenList = teamSellerList
+						if len(teamSellerList) > 0 {
+							groupSellerList = append(groupSellerList, teamItem)
+						}
+					}
+					//分组为0的销售（直属分组）
+					groupTeamSellerList, err := system.GetGrooupsysUserList(group.GroupId, roleCodeTypeStr, enabled)
+					if err != nil {
+						br.Msg = "获取销售失败"
+						br.ErrMsg = "获取销售失败,Err:" + err.Error()
+						return
+					}
+					if len(groupTeamSellerList) > 0 {
+						tmpDepartmentGroupSellersList := make([]company.DepartmentGroupSellers, 0)
+						for _, seller := range groupTeamSellerList {
+							sellerItem := company.DepartmentGroupSellers{
+								AdminId: fmt.Sprint(seller.AdminId),
+								//AdminName string `description:"系统用户名称"`
+								RealName:     seller.RealName,
+								Authority:    seller.Authority,
+								RoleTypeCode: seller.RoleTypeCode,
+							}
+							tmpDepartmentGroupSellersList = append(tmpDepartmentGroupSellersList, sellerItem)
+						}
+						//排个序
+						tmpDepartmentGroupSellersList = sortDepartmentGroupSellers(tmpDepartmentGroupSellersList)
+						groupSellerList = append(groupSellerList, tmpDepartmentGroupSellersList...)
+					}
+
+					//groupItem.ChildrenList = groupSellerList
+					//if len(groupSellerList) > 0 {
+					//	list = append(list, item)
+					//}
+
+					//sellerList, err := system.GetGroupSysUserList(group.DepartmentId)
+					//if err != nil {
+					//	br.Msg = "获取销售失败"
+					//	br.ErrMsg = "获取销售失败,Err:" + err.Error()
+					//	return
+					//}
+					//for _, seller := range sellerList {
+					//	sellerItem := company.DepartmentGroupSellers{
+					//		AdminId: fmt.Sprint(seller.AdminId),
+					//		//AdminName string `description:"系统用户名称"`
+					//		RealName:     seller.RealName,
+					//		Authority:    seller.Authority,
+					//		RoleTypeCode: seller.RoleTypeCode,
+					//	}
+					//	groupSellerList = append(groupSellerList, sellerItem)
+					//}
+					//groupSellerList = sortDepartmentGroupSellers(groupSellerList)
+					groupItem.ChildrenList = groupSellerList
+					if len(groupSellerList) > 0 {
+						list = append(list, groupItem)
+					}
+				}
+
+				//分组为0的销售（直属部门）
+				departmentSellerList, err := system.GetDepartmentGroupSysUserList(departmentId, 0, roleCodeTypeStr)
+				if err != nil {
+					br.Msg = "获取销售失败"
+					br.ErrMsg = "获取销售失败,Err:" + err.Error()
+					return
+				}
+				if len(departmentSellerList) > 0 {
+					tmpDepartmentGroupSeller := make([]company.DepartmentGroupSellers, 0)
+					for _, seller := range departmentSellerList {
+						sellerItem := company.DepartmentGroupSellers{
+							AdminId: fmt.Sprint(seller.AdminId),
+							//AdminName string `description:"系统用户名称"`
+							RealName:     seller.RealName,
+							Authority:    seller.Authority,
+							RoleTypeCode: seller.RoleTypeCode,
+						}
+						tmpDepartmentGroupSeller = append(tmpDepartmentGroupSeller, sellerItem)
+					}
+					tmpDepartmentGroupSeller = sortDepartmentGroupSellers(tmpDepartmentGroupSeller)
+					list = append(list, tmpDepartmentGroupSeller...)
+				}
+			}
+
+		} else if sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_FICC_GROUP || sysUser.Authority == 2 {
+			// 销售主管看小组
+			if status == 0 {
+				pid, err := company.GetParentIdFromGroup(sysUser.GroupId)
+				if err != nil {
+					br.Msg = "获取失败"
+					br.ErrMsg = "查询父级id异常" + err.Error()
+					return
+				}
+				var realGroupId int
+				if pid != nil && *pid > 0 {
+					//主管角色放在了三级分组下
+					realGroupId = *pid
+				} else {
+					//主管角色放在了二级分组下
+					realGroupId = sysUser.GroupId
+				}
+				groupList, err := system.GetSysGroupByGroupId(realGroupId)
+				if err != nil {
+					br.Msg = "获取失败"
+					br.ErrMsg = "获取分组失败,Err:" + err.Error()
+					return
+				}
+				for _, group := range groupList {
+					groupSellerList := make([]company.DepartmentGroupSellers, 0)
+					//groupItem := company.DepartmentGroupSellers{
+					//	AdminId: fmt.Sprint("group_", group.DepartmentId),
+					//	//AdminName string `description:"系统用户名称"`
+					//	RealName:     group.GroupName,
+					//	ChildrenList: groupSellerList,
+					//}
+					teamList, err := system.GetSysTeamByDepartmentId(group.GroupId)
+					if err != nil {
+						br.Msg = "获取小组失败"
+						br.ErrMsg = "获取小组失败,Err:" + err.Error()
+						return
+					}
+					for _, team := range teamList {
+						teamSellerList := make([]company.DepartmentGroupSellers, 0)
+						teamItem := company.DepartmentGroupSellers{
+							AdminId: fmt.Sprint("team_", team.GroupId),
+							//AdminName string `description:"系统用户名称"`
+							RealName:     team.GroupName,
+							ChildrenList: teamSellerList,
+						}
+						sellerList, err := system.GetTeamSysUserList(team.GroupId, enabled)
+						if err != nil {
+							br.Msg = "获取销售失败"
+							br.ErrMsg = "获取销售失败,Err:" + err.Error()
+							return
+						}
+						for _, seller := range sellerList {
+							sellerItem := company.DepartmentGroupSellers{
+								AdminId: fmt.Sprint(seller.AdminId),
+								//AdminName string `description:"系统用户名称"`
+								RealName:     seller.RealName,
+								Authority:    seller.Authority,
+								RoleTypeCode: seller.RoleTypeCode,
+							}
+							//fmt.Println("seller.RealName:", seller.RealName)
+							teamSellerList = append(teamSellerList, sellerItem)
+						}
+						teamSellerList = sortDepartmentGroupSellers(teamSellerList)
+						teamItem.ChildrenList = teamSellerList
+						if len(teamSellerList) > 0 {
+							groupSellerList = append(groupSellerList, teamItem)
+						}
+					}
+					//分组为0的销售（直属分组）
+					groupTeamSellerList, err := system.GetGrooupsysUserList(realGroupId, roleCodeTypeStr, enabled)
+					if err != nil {
+						br.Msg = "获取销售失败"
+						br.ErrMsg = "获取销售失败,Err:" + err.Error()
+						return
+					}
+					if len(groupTeamSellerList) > 0 {
+						tmpDepartmentGroupSellersList := make([]company.DepartmentGroupSellers, 0)
+						for _, seller := range groupTeamSellerList {
+							sellerItem := company.DepartmentGroupSellers{
+								AdminId: fmt.Sprint(seller.AdminId),
+								//AdminName string `description:"系统用户名称"`
+								RealName:     seller.RealName,
+								Authority:    seller.Authority,
+								RoleTypeCode: seller.RoleTypeCode,
+							}
+							tmpDepartmentGroupSellersList = append(tmpDepartmentGroupSellersList, sellerItem)
+						}
+						//排个序
+						tmpDepartmentGroupSellersList = sortDepartmentGroupSellers(tmpDepartmentGroupSellersList)
+						groupSellerList = append(groupSellerList, tmpDepartmentGroupSellersList...)
+					}
+					list = groupSellerList
+					//groupItem.ChildrenList = groupSellerList
+					//if len(groupSellerList) > 0 {
+					//	list = append(list, item)
+					//}
+
+					//sellerList, err := system.GetGroupSysUserList(group.DepartmentId)
+					//if err != nil {
+					//	br.Msg = "获取销售失败"
+					//	br.ErrMsg = "获取销售失败,Err:" + err.Error()
+					//	return
+					//}
+					//for _, seller := range sellerList {
+					//	sellerItem := company.DepartmentGroupSellers{
+					//		AdminId: fmt.Sprint(seller.AdminId),
+					//		//AdminName string `description:"系统用户名称"`
+					//		RealName:     seller.RealName,
+					//		Authority:    seller.Authority,
+					//		RoleTypeCode: seller.RoleTypeCode,
+					//	}
+					//	groupSellerList = append(groupSellerList, sellerItem)
+					//}
+					//groupSellerList = sortDepartmentGroupSellers(groupSellerList)
+
+					//groupItem.ChildrenList = groupSellerList
+					//if len(groupSellerList) > 0 {
+					//	list = append(list, groupItem)
+					//}
+
+				}
+
+				//分组为0的销售（直属二级分组）
+				//departmentSellerList, err := system.GetDepartmentGroupSysUserList(2, realGroupId, roleCodeTypeStr)
+				//if err != nil {
+				//	br.Msg = "获取销售失败"
+				//	br.ErrMsg = "获取销售失败,Err:" + err.Error()
+				//	return
+				//}
+				//if len(departmentSellerList) > 0 {
+				//	tmpDepartmentGroupSeller := make([]company.DepartmentGroupSellers, 0)
+				//	for _, seller := range departmentSellerList {
+				//		sellerItem := company.DepartmentGroupSellers{
+				//			AdminId: fmt.Sprint(seller.AdminId),
+				//			//AdminName string `description:"系统用户名称"`
+				//			RealName:     seller.RealName,
+				//			Authority:    seller.Authority,
+				//			RoleTypeCode: seller.RoleTypeCode,
+				//		}
+				//		tmpDepartmentGroupSeller = append(tmpDepartmentGroupSeller, sellerItem)
+				//	}
+				//	tmpDepartmentGroupSeller = sortDepartmentGroupSellers(tmpDepartmentGroupSeller)
+				//	list = append(list, tmpDepartmentGroupSeller...)
+				//}
+				//pid, err := company.GetParentIdFromGroup(sysUser.GroupId)
+				//if err != nil {
+				//	br.Msg = "获取失败"
+				//	br.ErrMsg = "查询父级id异常" + err.Error()
+				//	return
+				//}
+				//if pid != nil && *pid > 0 {
+				//	//主管角色放在了三级分组下
+				//	//
+				//
+				//
+				//} else {
+				//	//主管角色放在了二级分组下
+				//
+				//}
+				//ids, err := company.GetGroupIdsByParentId(*pid)
+				//if err != nil {
+				//	br.Msg = "获取失败"
+				//	br.ErrMsg = "查询父级id异常" + err.Error()
+				//	return
+				//}
+				//var idSlice []string
+				//var sid string
+				//for _, id := range ids {
+				//	idSlice = append(idSlice, *id)
+				//}
+				//sid = strings.Join(idSlice, ",")
+				//sellerList, err := system.GetTeamSysUserListByIds(sid)
+				//if err != nil {
+				//	br.Msg = "获取销售失败"
+				//	br.ErrMsg = "获取销售失败,Err:" + err.Error()
+				//	return
+				//}
+				//for _, seller := range sellerList {
+				//	sellerItem := company.DepartmentGroupSellers{
+				//		AdminId: fmt.Sprint(seller.AdminId),
+				//		//AdminName string `description:"系统用户名称"`
+				//		RealName:     seller.RealName,
+				//		Authority:    seller.Authority,
+				//		RoleTypeCode: seller.RoleTypeCode,
+				//	}
+				//	fmt.Println("seller.RealName:", seller.RealName)
+				//	list = append(list, sellerItem)
+				//}
+				//list = sortDepartmentGroupSellers(list)
+				//
+				////分组为0的销售（直属分组）
+				//groupTeamSellerList, err := system.GetGrooupsysUserList(sysUser.GroupId, roleCodeTypeStr)
+				//if err != nil {
+				//	br.Msg = "获取销售失败"
+				//	br.ErrMsg = "获取销售失败,Err:" + err.Error()
+				//	return
+				//}
+				//if len(groupTeamSellerList) > 0 {
+				//	tmpDepartmentGroupSellersList := make([]company.DepartmentGroupSellers, 0)
+				//	for _, seller := range groupTeamSellerList {
+				//		sellerItem := company.DepartmentGroupSellers{
+				//			AdminId: fmt.Sprint(seller.AdminId),
+				//			//AdminName string `description:"系统用户名称"`
+				//			RealName:     seller.RealName,
+				//			Authority:    seller.Authority,
+				//			RoleTypeCode: seller.RoleTypeCode,
+				//		}
+				//		tmpDepartmentGroupSellersList = append(tmpDepartmentGroupSellersList, sellerItem)
+				//	}
+				//	//排个序
+				//	tmpDepartmentGroupSellersList = sortDepartmentGroupSellers(tmpDepartmentGroupSellersList)
+				//	list = append(list, tmpDepartmentGroupSellersList...)
+				//}
+				//sellerList, err := system.GetDepartmentGroupSysUserList(sysUser.DepartmentId, sysUser.GroupId, roleCodeTypeStr)
+				//if err != nil {
+				//	br.Msg = "获取销售失败"
+				//	br.ErrMsg = "获取销售失败,Err:" + err.Error()
+				//	return
+				//}
+				//for _, seller := range sellerList {
+				//	sellerItem := company.DepartmentGroupSellers{
+				//		AdminId: fmt.Sprint(seller.AdminId),
+				//		//AdminName string `description:"系统用户名称"`
+				//		RealName:     seller.RealName,
+				//		Authority:    seller.Authority,
+				//		RoleTypeCode: seller.RoleTypeCode,
+				//	}
+				//	list = append(list, sellerItem)
+				//	list = sortDepartmentGroupSellers(list)
+				//}
+
+				//正常来说没有所有人都应该在某个小组下，要不就是小组名为 无 的小组
+			} else {
+				//var departmentStr string
+				//if utils.RunMode == "release" {
+				//	departmentStr = `1,2`
+				//} else {
+				//	departmentStr = `1,2`
+				//}
+				departmentStr := `1,2`
+				departmentList, err := system.GetDepartmentListByIds(departmentStr)
+				if err != nil {
+					br.Msg = "获取失败"
+					br.ErrMsg = "获取部门失败,Err:" + err.Error()
+					return
+				}
+				for _, department := range departmentList {
+					departmentGroupSellerList := make([]company.DepartmentGroupSellers, 0)
+					item := company.DepartmentGroupSellers{
+						AdminId: fmt.Sprint("department_", department.DepartmentId),
+						//AdminName string `description:"系统用户名称"`
+						RealName:     department.DepartmentName,
+						ChildrenList: departmentGroupSellerList,
+					}
+
+					groupList, err := system.GetSysGroupByDepartmentId(department.DepartmentId)
+					if err != nil {
+						br.Msg = "获取失败"
+						br.ErrMsg = "获取分组失败,Err:" + err.Error()
+						return
+					}
+					for _, group := range groupList {
+						groupSellerList := make([]company.DepartmentGroupSellers, 0)
+						groupItem := company.DepartmentGroupSellers{
+							AdminId: fmt.Sprint("group_", group.DepartmentId),
+							//AdminName string `description:"系统用户名称"`
+							RealName:     group.GroupName,
+							ChildrenList: groupSellerList,
+						}
+						teamList, err := system.GetSysTeamByDepartmentId(group.GroupId)
+						if err != nil {
+							br.Msg = "获取小组失败"
+							br.ErrMsg = "获取小组失败,Err:" + err.Error()
+							return
+						}
+						for _, team := range teamList {
+							teamSellerList := make([]company.DepartmentGroupSellers, 0)
+							teamItem := company.DepartmentGroupSellers{
+								AdminId: fmt.Sprint("team_", team.GroupId),
+								//AdminName string `description:"系统用户名称"`
+								RealName:     team.GroupName,
+								ChildrenList: teamSellerList,
+							}
+							sellerList, err := system.GetTeamSysUserList(team.GroupId, enabled)
+							if err != nil {
+								br.Msg = "获取销售失败"
+								br.ErrMsg = "获取销售失败,Err:" + err.Error()
+								return
+							}
+							for _, seller := range sellerList {
+								sellerItem := company.DepartmentGroupSellers{
+									AdminId: fmt.Sprint(seller.AdminId),
+									//AdminName string `description:"系统用户名称"`
+									RealName:     seller.RealName,
+									Authority:    seller.Authority,
+									RoleTypeCode: seller.RoleTypeCode,
+								}
+								//fmt.Println("seller.RealName:", seller.RealName)
+								teamSellerList = append(teamSellerList, sellerItem)
+							}
+							teamSellerList = sortDepartmentGroupSellers(teamSellerList)
+							teamItem.ChildrenList = teamSellerList
+							if len(teamSellerList) > 0 {
+								groupSellerList = append(groupSellerList, teamItem)
+							}
+						}
+						//分组为0的人，不光是销售（直属分组）
+						groupTeamSellerList, err := system.GetGroupSysUserList(group.GroupId)
+						if err != nil {
+							br.Msg = "获取销售失败"
+							br.ErrMsg = "获取销售失败,Err:" + err.Error()
+							return
+						}
+						if len(groupTeamSellerList) > 0 {
+							tmpDepartmentGroupSellersList := make([]company.DepartmentGroupSellers, 0)
+							for _, seller := range groupTeamSellerList {
+								sellerItem := company.DepartmentGroupSellers{
+									AdminId: fmt.Sprint(seller.AdminId),
+									//AdminName string `description:"系统用户名称"`
+									RealName:     seller.RealName,
+									Authority:    seller.Authority,
+									RoleTypeCode: seller.RoleTypeCode,
+								}
+								tmpDepartmentGroupSellersList = append(tmpDepartmentGroupSellersList, sellerItem)
+							}
+							//排个序
+							tmpDepartmentGroupSellersList = sortDepartmentGroupSellers(tmpDepartmentGroupSellersList)
+							groupSellerList = append(groupSellerList, tmpDepartmentGroupSellersList...)
+						}
+
+						//groupItem.ChildrenList = groupSellerList
+						//if len(groupSellerList) > 0 {
+						//	list = append(list, item)
+						//}
+
+						//sellerList, err := system.GetGroupSysUserList(group.DepartmentId)
+						//if err != nil {
+						//	br.Msg = "获取销售失败"
+						//	br.ErrMsg = "获取销售失败,Err:" + err.Error()
+						//	return
+						//}
+						//for _, seller := range sellerList {
+						//	sellerItem := company.DepartmentGroupSellers{
+						//		AdminId: fmt.Sprint(seller.AdminId),
+						//		//AdminName string `description:"系统用户名称"`
+						//		RealName:     seller.RealName,
+						//		Authority:    seller.Authority,
+						//		RoleTypeCode: seller.RoleTypeCode,
+						//	}
+						//	groupSellerList = append(groupSellerList, sellerItem)
+						//}
+						//groupSellerList = sortDepartmentGroupSellers(groupSellerList)
+						groupItem.ChildrenList = groupSellerList
+						if len(groupSellerList) > 0 {
+							departmentGroupSellerList = append(departmentGroupSellerList, groupItem)
+						}
+					}
+
+					//分组为0的人，不光是销售（直属部门）
+					departmentSellerList, err := system.GetDepartmentGroupSysUserList(department.DepartmentId, 0, "")
+					if err != nil {
+						br.Msg = "获取销售失败"
+						br.ErrMsg = "获取销售失败,Err:" + err.Error()
+						return
+					}
+					if len(departmentSellerList) > 0 {
+						tmpDepartmentGroupSellersList := make([]company.DepartmentGroupSellers, 0)
+						for _, seller := range departmentSellerList {
+							sellerItem := company.DepartmentGroupSellers{
+								AdminId: fmt.Sprint(seller.AdminId),
+								//AdminName string `description:"系统用户名称"`
+								RealName:     seller.RealName,
+								Authority:    seller.Authority,
+								RoleTypeCode: seller.RoleTypeCode,
+							}
+							tmpDepartmentGroupSellersList = append(tmpDepartmentGroupSellersList, sellerItem)
+						}
+						//排个序
+						tmpDepartmentGroupSellersList = sortDepartmentGroupSellers(tmpDepartmentGroupSellersList)
+						departmentGroupSellerList = append(departmentGroupSellerList, tmpDepartmentGroupSellersList...)
+					}
+
+					item.ChildrenList = departmentGroupSellerList
+					if len(departmentGroupSellerList) > 0 {
+						list = append(list, item)
+					}
+				}
+			}
+		} else if sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_FICC_SELLER && status == 1 {
+			//var departmentStr string
+			//if utils.RunMode == "release" {
+			//	departmentStr = `1,2`
+			//} else {
+			//	departmentStr = `1,2`
+			//}
+			departmentStr := `1,2`
+			departmentList, err := system.GetDepartmentListByIds(departmentStr)
+			if err != nil {
+				br.Msg = "获取失败"
+				br.ErrMsg = "获取部门失败,Err:" + err.Error()
+				return
+			}
+			for _, department := range departmentList {
+				departmentGroupSellerList := make([]company.DepartmentGroupSellers, 0)
+				item := company.DepartmentGroupSellers{
+					AdminId: fmt.Sprint("department_", department.DepartmentId),
+					//AdminName string `description:"系统用户名称"`
+					RealName:     department.DepartmentName,
+					ChildrenList: departmentGroupSellerList,
+				}
+
+				groupList, err := system.GetSysGroupByDepartmentId(department.DepartmentId)
+				if err != nil {
+					br.Msg = "获取失败"
+					br.ErrMsg = "获取分组失败,Err:" + err.Error()
+					return
+				}
+				for _, group := range groupList {
+					groupSellerList := make([]company.DepartmentGroupSellers, 0)
+					groupItem := company.DepartmentGroupSellers{
+						AdminId: fmt.Sprint("group_", group.DepartmentId),
+						//AdminName string `description:"系统用户名称"`
+						RealName:     group.GroupName,
+						ChildrenList: groupSellerList,
+					}
+					teamList, err := system.GetSysTeamByDepartmentId(group.GroupId)
+					if err != nil {
+						br.Msg = "获取小组失败"
+						br.ErrMsg = "获取小组失败,Err:" + err.Error()
+						return
+					}
+					for _, team := range teamList {
+						teamSellerList := make([]company.DepartmentGroupSellers, 0)
+						teamItem := company.DepartmentGroupSellers{
+							AdminId: fmt.Sprint("team_", team.GroupId),
+							//AdminName string `description:"系统用户名称"`
+							RealName:     team.GroupName,
+							ChildrenList: teamSellerList,
+						}
+						sellerList, err := system.GetTeamSysUserList(team.GroupId, enabled)
+						if err != nil {
+							br.Msg = "获取销售失败"
+							br.ErrMsg = "获取销售失败,Err:" + err.Error()
+							return
+						}
+						for _, seller := range sellerList {
+							sellerItem := company.DepartmentGroupSellers{
+								AdminId: fmt.Sprint(seller.AdminId),
+								//AdminName string `description:"系统用户名称"`
+								RealName:     seller.RealName,
+								Authority:    seller.Authority,
+								RoleTypeCode: seller.RoleTypeCode,
+							}
+							//fmt.Println("seller.RealName:", seller.RealName)
+							teamSellerList = append(teamSellerList, sellerItem)
+						}
+						teamSellerList = sortDepartmentGroupSellers(teamSellerList)
+						teamItem.ChildrenList = teamSellerList
+						if len(teamSellerList) > 0 {
+							groupSellerList = append(groupSellerList, teamItem)
+						}
+					}
+					//分组为0的人，不光是销售（直属分组）
+					groupTeamSellerList, err := system.GetGroupSysUserList(group.GroupId)
+					if err != nil {
+						br.Msg = "获取销售失败"
+						br.ErrMsg = "获取销售失败,Err:" + err.Error()
+						return
+					}
+					if len(groupTeamSellerList) > 0 {
+						tmpDepartmentGroupSellersList := make([]company.DepartmentGroupSellers, 0)
+						for _, seller := range groupTeamSellerList {
+							sellerItem := company.DepartmentGroupSellers{
+								AdminId: fmt.Sprint(seller.AdminId),
+								//AdminName string `description:"系统用户名称"`
+								RealName:     seller.RealName,
+								Authority:    seller.Authority,
+								RoleTypeCode: seller.RoleTypeCode,
+							}
+							tmpDepartmentGroupSellersList = append(tmpDepartmentGroupSellersList, sellerItem)
+						}
+						//排个序
+						tmpDepartmentGroupSellersList = sortDepartmentGroupSellers(tmpDepartmentGroupSellersList)
+						groupSellerList = append(groupSellerList, tmpDepartmentGroupSellersList...)
+					}
+
+					//groupItem.ChildrenList = groupSellerList
+					//if len(groupSellerList) > 0 {
+					//	list = append(list, item)
+					//}
+
+					//sellerList, err := system.GetGroupSysUserList(group.DepartmentId)
+					//if err != nil {
+					//	br.Msg = "获取销售失败"
+					//	br.ErrMsg = "获取销售失败,Err:" + err.Error()
+					//	return
+					//}
+					//for _, seller := range sellerList {
+					//	sellerItem := company.DepartmentGroupSellers{
+					//		AdminId: fmt.Sprint(seller.AdminId),
+					//		//AdminName string `description:"系统用户名称"`
+					//		RealName:     seller.RealName,
+					//		Authority:    seller.Authority,
+					//		RoleTypeCode: seller.RoleTypeCode,
+					//	}
+					//	groupSellerList = append(groupSellerList, sellerItem)
+					//}
+					//groupSellerList = sortDepartmentGroupSellers(groupSellerList)
+					groupItem.ChildrenList = groupSellerList
+					if len(groupSellerList) > 0 {
+						departmentGroupSellerList = append(departmentGroupSellerList, groupItem)
+					}
+				}
+
+				//分组为0的人，不光是销售（直属部门）
+				departmentSellerList, err := system.GetDepartmentGroupSysUserList(department.DepartmentId, 0, "")
+				if err != nil {
+					br.Msg = "获取销售失败"
+					br.ErrMsg = "获取销售失败,Err:" + err.Error()
+					return
+				}
+				if len(departmentSellerList) > 0 {
+					tmpDepartmentGroupSellersList := make([]company.DepartmentGroupSellers, 0)
+					for _, seller := range departmentSellerList {
+						sellerItem := company.DepartmentGroupSellers{
+							AdminId: fmt.Sprint(seller.AdminId),
+							//AdminName string `description:"系统用户名称"`
+							RealName:     seller.RealName,
+							Authority:    seller.Authority,
+							RoleTypeCode: seller.RoleTypeCode,
+						}
+						tmpDepartmentGroupSellersList = append(tmpDepartmentGroupSellersList, sellerItem)
+					}
+					//排个序
+					tmpDepartmentGroupSellersList = sortDepartmentGroupSellers(tmpDepartmentGroupSellersList)
+					departmentGroupSellerList = append(departmentGroupSellerList, tmpDepartmentGroupSellersList...)
+				}
+
+				item.ChildrenList = departmentGroupSellerList
+				if len(departmentGroupSellerList) > 0 {
+					list = append(list, item)
+				}
+			}
+		} else if sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_RAI_SELLER && status == 1 {
+			// 权益销售可以看到权益销售部的所有人
+			departmentId := 5
+			groupList, err := system.GetSysGroupByDepartmentId(departmentId)
+			if err != nil {
+				br.Msg = "获取失败"
+				br.ErrMsg = "获取分组失败,Err:" + err.Error()
+				return
+			}
+			for _, group := range groupList {
+				groupSellerList := make([]company.DepartmentGroupSellers, 0)
+				groupItem := company.DepartmentGroupSellers{
+					AdminId: fmt.Sprint("group_", group.DepartmentId),
+					//AdminName string `description:"系统用户名称"`
+					RealName:     group.GroupName,
+					ChildrenList: groupSellerList,
+				}
+				teamList, err := system.GetSysTeamByDepartmentId(group.GroupId)
+				if err != nil {
+					br.Msg = "获取小组失败"
+					br.ErrMsg = "获取小组失败,Err:" + err.Error()
+					return
+				}
+				for _, team := range teamList {
+					teamSellerList := make([]company.DepartmentGroupSellers, 0)
+					teamItem := company.DepartmentGroupSellers{
+						AdminId: fmt.Sprint("team_", team.GroupId),
+						//AdminName string `description:"系统用户名称"`
+						RealName:     team.GroupName,
+						ChildrenList: teamSellerList,
+					}
+					sellerList, err := system.GetTeamSysUserList(team.GroupId, enabled)
+					if err != nil {
+						br.Msg = "获取销售失败"
+						br.ErrMsg = "获取销售失败,Err:" + err.Error()
+						return
+					}
+					for _, seller := range sellerList {
+						sellerItem := company.DepartmentGroupSellers{
+							AdminId: fmt.Sprint(seller.AdminId),
+							//AdminName string `description:"系统用户名称"`
+							RealName:     seller.RealName,
+							Authority:    seller.Authority,
+							RoleTypeCode: seller.RoleTypeCode,
+						}
+						//fmt.Println("seller.RealName:", seller.RealName)
+						teamSellerList = append(teamSellerList, sellerItem)
+					}
+					teamSellerList = sortDepartmentGroupSellers(teamSellerList)
+					teamItem.ChildrenList = teamSellerList
+					if len(teamSellerList) > 0 {
+						groupSellerList = append(groupSellerList, teamItem)
+					}
+				}
+				//分组为0的销售（直属分组）
+				groupTeamSellerList, err := system.GetGrooupsysUserList(group.GroupId, roleCodeTypeStr, enabled)
+				if err != nil {
+					br.Msg = "获取销售失败"
+					br.ErrMsg = "获取销售失败,Err:" + err.Error()
+					return
+				}
+				if len(groupTeamSellerList) > 0 {
+					tmpDepartmentGroupSellersList := make([]company.DepartmentGroupSellers, 0)
+					for _, seller := range groupTeamSellerList {
+						sellerItem := company.DepartmentGroupSellers{
+							AdminId: fmt.Sprint(seller.AdminId),
+							//AdminName string `description:"系统用户名称"`
+							RealName:     seller.RealName,
+							Authority:    seller.Authority,
+							RoleTypeCode: seller.RoleTypeCode,
+						}
+						tmpDepartmentGroupSellersList = append(tmpDepartmentGroupSellersList, sellerItem)
+					}
+					//排个序
+					tmpDepartmentGroupSellersList = sortDepartmentGroupSellers(tmpDepartmentGroupSellersList)
+					groupSellerList = append(groupSellerList, tmpDepartmentGroupSellersList...)
+				}
+
+				//groupItem.ChildrenList = groupSellerList
+				//if len(groupSellerList) > 0 {
+				//	list = append(list, item)
+				//}
+
+				//sellerList, err := system.GetGroupSysUserList(group.DepartmentId)
+				//if err != nil {
+				//	br.Msg = "获取销售失败"
+				//	br.ErrMsg = "获取销售失败,Err:" + err.Error()
+				//	return
+				//}
+				//for _, seller := range sellerList {
+				//	sellerItem := company.DepartmentGroupSellers{
+				//		AdminId: fmt.Sprint(seller.AdminId),
+				//		//AdminName string `description:"系统用户名称"`
+				//		RealName:     seller.RealName,
+				//		Authority:    seller.Authority,
+				//		RoleTypeCode: seller.RoleTypeCode,
+				//	}
+				//	groupSellerList = append(groupSellerList, sellerItem)
+				//}
+				//groupSellerList = sortDepartmentGroupSellers(groupSellerList)
+				groupItem.ChildrenList = groupSellerList
+				if len(groupSellerList) > 0 {
+					list = append(list, groupItem)
+				}
+			}
+
+			//分组为0的销售（直属部门）
+			departmentSellerList, err := system.GetDepartmentGroupSysUserList(departmentId, 0, roleCodeTypeStr)
+			if err != nil {
+				br.Msg = "获取销售失败"
+				br.ErrMsg = "获取销售失败,Err:" + err.Error()
+				return
+			}
+			if len(departmentSellerList) > 0 {
+				tmpDepartmentGroupSeller := make([]company.DepartmentGroupSellers, 0)
+				for _, seller := range departmentSellerList {
+					sellerItem := company.DepartmentGroupSellers{
+						AdminId: fmt.Sprint(seller.AdminId),
+						//AdminName string `description:"系统用户名称"`
+						RealName:     seller.RealName,
+						Authority:    seller.Authority,
+						RoleTypeCode: seller.RoleTypeCode,
+					}
+					tmpDepartmentGroupSeller = append(tmpDepartmentGroupSeller, sellerItem)
+				}
+				tmpDepartmentGroupSeller = sortDepartmentGroupSellers(tmpDepartmentGroupSeller)
+				list = append(list, tmpDepartmentGroupSeller...)
+			}
+		} else {
+			//看自己
+			sellerItem := company.DepartmentGroupSellers{
+				AdminId: fmt.Sprint(sysUser.AdminId),
+				//AdminName string `description:"系统用户名称"`
+				RealName: sysUser.RealName,
+			}
+			list = append(list, sellerItem)
+		}
+	} else {
+		// 权益管理员，查看所有权益的账号
+		roleCodeTypeStr := `"` + utils.ROLE_TYPE_CODE_RAI_SELLER + `","` + utils.ROLE_TYPE_CODE_RAI_GROUP + `","` + utils.ROLE_TYPE_CODE_RAI_RESEARCHR + `","` + utils.ROLE_TYPE_CODE_RAI_ADMIN + `"`
+		departmentId := 5
+		enabled := 1
+		groupList, err := system.GetSysGroupByDepartmentId(departmentId)
+		if err != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取分组失败,Err:" + err.Error()
+			return
+		}
+		for _, group := range groupList {
+			groupSellerList := make([]company.DepartmentGroupSellers, 0)
+			groupItem := company.DepartmentGroupSellers{
+				AdminId: fmt.Sprint("group_", group.DepartmentId),
+				//AdminName string `description:"系统用户名称"`
+				RealName:     group.GroupName,
+				ChildrenList: groupSellerList,
+			}
+			teamList, err := system.GetSysTeamByDepartmentId(group.GroupId)
+			if err != nil {
+				br.Msg = "获取小组失败"
+				br.ErrMsg = "获取小组失败,Err:" + err.Error()
+				return
+			}
+			for _, team := range teamList {
+				teamSellerList := make([]company.DepartmentGroupSellers, 0)
+				teamItem := company.DepartmentGroupSellers{
+					AdminId: fmt.Sprint("team_", team.GroupId),
+					//AdminName string `description:"系统用户名称"`
+					RealName:     team.GroupName,
+					ChildrenList: teamSellerList,
+				}
+				sellerList, err := system.GetTeamSysUserList(team.GroupId, enabled)
+				if err != nil {
+					br.Msg = "获取销售失败"
+					br.ErrMsg = "获取销售失败,Err:" + err.Error()
+					return
+				}
+				for _, seller := range sellerList {
+					sellerItem := company.DepartmentGroupSellers{
+						AdminId: fmt.Sprint(seller.AdminId),
+						//AdminName string `description:"系统用户名称"`
+						RealName:     seller.RealName,
+						Authority:    seller.Authority,
+						RoleTypeCode: seller.RoleTypeCode,
+					}
+					//fmt.Println("seller.RealName:", seller.RealName)
+					teamSellerList = append(teamSellerList, sellerItem)
+				}
+				teamSellerList = sortDepartmentGroupSellers(teamSellerList)
+				teamItem.ChildrenList = teamSellerList
+				if len(teamSellerList) > 0 {
+					groupSellerList = append(groupSellerList, teamItem)
+				}
+			}
+			//分组为0的销售（直属分组）
+			groupTeamSellerList, err := system.GetGrooupsysUserList(group.GroupId, roleCodeTypeStr, enabled)
+			if err != nil {
+				br.Msg = "获取销售失败"
+				br.ErrMsg = "获取销售失败,Err:" + err.Error()
+				return
+			}
+			if len(groupTeamSellerList) > 0 {
+				tmpDepartmentGroupSellersList := make([]company.DepartmentGroupSellers, 0)
+				for _, seller := range groupTeamSellerList {
+					sellerItem := company.DepartmentGroupSellers{
+						AdminId: fmt.Sprint(seller.AdminId),
+						//AdminName string `description:"系统用户名称"`
+						RealName:     seller.RealName,
+						Authority:    seller.Authority,
+						RoleTypeCode: seller.RoleTypeCode,
+					}
+					tmpDepartmentGroupSellersList = append(tmpDepartmentGroupSellersList, sellerItem)
+				}
+				//排个序
+				tmpDepartmentGroupSellersList = sortDepartmentGroupSellers(tmpDepartmentGroupSellersList)
+				groupSellerList = append(groupSellerList, tmpDepartmentGroupSellersList...)
+			}
+
+			groupItem.ChildrenList = groupSellerList
+			if len(groupSellerList) > 0 {
+				resp = append(resp, groupItem)
+			}
+		}
+
+		//分组为0的销售（直属部门）
+		departmentSellerList, err := system.GetDepartmentGroupSysUserList(departmentId, 0, roleCodeTypeStr)
+		if err != nil {
+			br.Msg = "获取销售失败"
+			br.ErrMsg = "获取销售失败,Err:" + err.Error()
+			return
+		}
+		if len(departmentSellerList) > 0 {
+			tmpDepartmentGroupSeller := make([]company.DepartmentGroupSellers, 0)
+			for _, seller := range departmentSellerList {
+				sellerItem := company.DepartmentGroupSellers{
+					AdminId: fmt.Sprint(seller.AdminId),
+					//AdminName string `description:"系统用户名称"`
+					RealName:     seller.RealName,
+					Authority:    seller.Authority,
+					RoleTypeCode: seller.RoleTypeCode,
+				}
+				tmpDepartmentGroupSeller = append(tmpDepartmentGroupSeller, sellerItem)
+			}
+			tmpDepartmentGroupSeller = sortDepartmentGroupSellers(tmpDepartmentGroupSeller)
+			resp = append(resp, tmpDepartmentGroupSeller...)
+		}
+		list = resp
+	}
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+	br.Data = company.DepartmentGroupSellersResp{
+		List: list,
+	}
+}

controllers/company_share.go

@@ -50,9 +50,10 @@ func (this *CompanyController) CompanyShare() {
 		br.ErrMsg = "IsShare:" + strconv.Itoa(req.IsShare)
 		return
 	}
+	productId := services.GetProductId(sysUser.RoleTypeCode)
 
 	//查询该客户
-	companyItem, err := company.GetCompanyById(req.CompanyId)
+	companyProductItem, err := company.GetCompanyProductByCompanyIdAndProductId(req.CompanyId, productId)
 	if err != nil {
 		br.Msg = "查找客户失败"
 		br.ErrMsg = "查找客户失败,Err:" + err.Error()
@@ -61,15 +62,15 @@ func (this *CompanyController) CompanyShare() {
 
 	//待更新字段
 	updateCol := make([]string, 0)
-	companyItem.IsShare = req.IsShare
+	companyProductItem.IsShare = req.IsShare
 	updateCol = append(updateCol, "IsShare")
 	if req.IsShare == 0 {
-		companyItem.ShareSeller = ""
-		companyItem.ShareSellerId = 0
+		companyProductItem.ShareSeller = ""
+		companyProductItem.ShareSellerId = 0
 		updateCol = append(updateCol, "ShareSeller", "ShareSellerId")
 	}
 
-	err = companyItem.Update(updateCol)
+	err = companyProductItem.Update(updateCol)
 	if err != nil {
 		br.Msg = "修改客户信息失败"
 		br.ErrMsg = "修改客户信息失败,Err:" + err.Error()
@@ -185,7 +186,7 @@ func (this *CompanyController) CompanyShareList() {
 				}
 				if sysUser.GroupId == groupId {
 					if sellerIdStr != "" {
-						condition += ` AND a.share_seller_id IN (` + sellerIdStr + `) `
+						condition += ` AND b.share_seller_id IN (` + sellerIdStr + `) `
 					}
 				} else {
 					if groupIdStr != "" {
@@ -201,7 +202,7 @@ func (this *CompanyController) CompanyShareList() {
 						return
 					}
 					if sellerIdStr != "" {
-						condition += ` AND a.share_seller_id IN (` + sellerIdStr + `) `
+						condition += ` AND b.share_seller_id IN (` + sellerIdStr + `) `
 					}
 				} else {
 					condition += ` AND b.group_id=? `
@@ -209,44 +210,54 @@ func (this *CompanyController) CompanyShareList() {
 				}
 			} else if sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_ADMIN && sysUser.AdminId != 66 && sysUser.AdminId != 15 && roleTypeCode != utils.ROLE_TYPE_CODE_FICC_ADMIN && roleTypeCode != utils.ROLE_TYPE_CODE_RAI_ADMIN {
 				if sysUser.GroupId == groupId {
-					condition += ` AND a.share_seller_id=? `
+					condition += ` AND b.share_seller_id=? `
 					pars = append(pars, sysUser.AdminId)
 				} else {
-					condition += ` AND b.seller_id=? `
-					pars = append(pars, sysUser.AdminId)
+					// 在此页面销售只能看分配给自己的客户
+					condition += ` AND (b.seller_id =? OR b.share_seller_id =? )`
+					pars = append(pars, sysUser.AdminId, sysUser.AdminId)
 				}
 			}
 		}
 	}
 
+
 	if listParam == 0 {
-		if sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_FICC_SELLER || sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_FICC_GROUP || sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_FICC_TEAM {
+		if sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_FICC_SELLER || sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_FICC_GROUP ||
+			sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_FICC_TEAM || sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_RAI_SELLER ||
+			sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_RAI_GROUP {
 			//非咨询组销售，那么默认查看“未共享”的客户
 			if sysUser.GroupId != groupId {
 				listParam = 3
-				if sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_FICC_SELLER {
+				if sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_FICC_SELLER || sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_RAI_SELLER {
 					condition += ` AND b.seller_id = ? `
 					pars = append(pars, sysUser.AdminId)
 				}
 			} else {
-				condition += ` AND a.is_share=1 `
+				condition += ` AND b.is_share=1 `
 			}
-		} else if sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_ADMIN || sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_FICC_ADMIN {
+		} else if sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_ADMIN || sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_FICC_ADMIN || sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_RAI_ADMIN {
 			// 管理员，默认查看“待分配”客户
 			listParam = 2
 		}
 	}
 
 	if listParam == 1 {
-		condition += ` AND a.share_seller_id > 0 AND a.is_share=1 `
+		condition += ` AND b.share_seller_id > 0 AND b.is_share=1 `
 	} else if listParam == 2 {
-		condition += ` AND a.share_seller_id = 0 AND a.is_share=1 `
+		condition += ` AND b.share_seller_id = 0 AND b.is_share=1 `
 	} else if listParam == 3 { // 未共享
-		condition += ` AND a.is_share=0 and b.status="正式"`
+		if productId == 1 {
+			condition += ` AND b.is_share=0 and (b.status="正式" AND b.product_id = 1) `
+		} else if productId == 2 {
+			condition += ` AND b.is_share=0 and (b.status IN ("正式","试用","永续") AND b.product_id = 2) `
+		} else {
+			condition += ` AND b.is_share=0 and ((b.status="正式" AND b.product_id = 1) OR (b.status IN ("正式","试用") AND b.product_id = 2))`
+		}
 	}
 
 	if sellerIds != "" {
-		condition += ` AND a.share_seller_id IN (` + sellerIds + `) `
+		condition += ` AND b.share_seller_id IN (` + sellerIds + `) `
 	}
 	if originalSellerIds != "" {
 		condition += ` AND b.seller_id IN (` + originalSellerIds + `) `
@@ -321,13 +332,26 @@ func (this *CompanyController) CompanyShareList() {
 		sortStr += fmt.Sprintf(` %s`, sortType)
 	} else {
 		if roleTypeCode == utils.ROLE_TYPE_CODE_ADMIN {
-			sortStr = " ORDER BY sort_status asc, all_view_total desc, a.created_time "
+			//sortStr = " ORDER BY sort_status asc, all_view_total desc, a.created_time "
+			sortStr = " ORDER BY start_date DESC, all_view_total desc, a.created_time "
 		} else {
-			sortStr = " ORDER BY sort_status asc, b.view_total desc, a.created_time  "
+			//sortStr = " ORDER BY sort_status asc, b.view_total desc, a.created_time  "
+			sortStr = " ORDER BY start_date DESC, b.view_total desc, a.created_time "
 		}
 		sortStr += " DESC "
 	}
 
+	sysUserList, err := system.GetAdminList()
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取admin列表失败, Err:" + err.Error()
+		return
+	}
+	adminMap := make(map[int]*system.Admin, 0)
+	for _, v := range sysUserList {
+		adminMap[v.AdminId] = v
+	}
+
 	list, err := company.GetShareCompanyList(condition, sortStr, pars, startSize, pageSize)
 	if err != nil {
 		br.Msg = "获取失败"
@@ -383,9 +407,9 @@ func (this *CompanyController) CompanyShareList() {
 		itemStatus := item.Status
 		if itemStatus != "" {
 			if !strings.Contains(item.Status, "/") {
-				if itemStatus == utils.COMPANY_STATUS_FOREVER { //永续
+				if strings.Contains(itemStatus, utils.COMPANY_STATUS_FOREVER) { //永续
 					expireDay = "-"
-				} else if itemStatus == utils.COMPANY_STATUS_TRY_OUT || itemStatus == utils.COMPANY_STATUS_FORMAL { //试用/正式
+				} else if strings.Contains(itemStatus, utils.COMPANY_STATUS_TRY_OUT) || strings.Contains(itemStatus, utils.COMPANY_STATUS_FORMAL) { //试用/正式
 					if item.StartDate != "" && item.EndDate != "" {
 						endDateTime, _ := time.Parse(utils.FormatDate, item.EndDate)
 						endDateTime = endDateTime.AddDate(0, 0, 1)
@@ -397,9 +421,9 @@ func (this *CompanyController) CompanyShareList() {
 					} else {
 						expireDay = "-"
 					}
-				} else if itemStatus == utils.COMPANY_STATUS_LOSE {
+				} else if strings.Contains(itemStatus, utils.COMPANY_STATUS_LOSE) {
 					expireDay = "-"
-				} else if itemStatus == utils.COMPANY_STATUS_FREEZE {
+				} else if strings.Contains(itemStatus, utils.COMPANY_STATUS_FREEZE) {
 					if item.StartDate != "" && item.EndDate != "" {
 						endDateTime, _ := time.Parse(utils.FormatDate, item.EndDate)
 						endDateTime = endDateTime.AddDate(0, 0, 0)
@@ -428,9 +452,9 @@ func (this *CompanyController) CompanyShareList() {
 						ficcEndDate = endDateArr[0]
 						tryEndDate = endDateArr[1]
 					}
-					if ficcStatus == utils.COMPANY_STATUS_FOREVER { //永续
+					if strings.Contains(ficcStatus, utils.COMPANY_STATUS_FOREVER) { //永续
 						ficcExpireDay = "-"
-					} else if ficcStatus == utils.COMPANY_STATUS_TRY_OUT || ficcStatus == utils.COMPANY_STATUS_FORMAL { //试用/正式
+					} else if strings.Contains(ficcStatus, utils.COMPANY_STATUS_X_CLASS_TRY_OUT) || strings.Contains(ficcStatus, utils.COMPANY_STATUS_FORMAL) { //试用/正式
 						if ficcEndDate != "" {
 							endDateTime, _ := time.Parse(utils.FormatDate, ficcEndDate)
 							endDateTime = endDateTime.AddDate(0, 0, 1)
@@ -442,9 +466,9 @@ func (this *CompanyController) CompanyShareList() {
 						} else {
 							ficcExpireDay = "-"
 						}
-					} else if ficcStatus == utils.COMPANY_STATUS_LOSE { //流失
+					} else if strings.Contains(ficcStatus, utils.COMPANY_STATUS_LOSE) { //流失
 						ficcExpireDay = "-"
-					} else if ficcStatus == utils.COMPANY_STATUS_FREEZE { //冻结
+					} else if strings.Contains(ficcStatus, utils.COMPANY_STATUS_FREEZE) { //冻结
 						if item.StartDate != "" && item.EndDate != "" {
 							endDateTime, _ := time.Parse(utils.FormatDate, ficcEndDate)
 							endDateTime = endDateTime.AddDate(0, 0, 0)
@@ -460,9 +484,9 @@ func (this *CompanyController) CompanyShareList() {
 						ficcExpireDay = "-"
 					}
 
-					if raiStatus == utils.COMPANY_STATUS_FOREVER { //永续
+					if strings.Contains(raiStatus, utils.COMPANY_STATUS_FOREVER) { //永续
 						tryExpireDay = "-"
-					} else if raiStatus == utils.COMPANY_STATUS_TRY_OUT || raiStatus == utils.COMPANY_STATUS_FORMAL { //试用/正式
+					} else if strings.Contains(raiStatus, utils.COMPANY_STATUS_X_CLASS_TRY_OUT) || strings.Contains(raiStatus, utils.COMPANY_STATUS_FORMAL) { //试用/正式
 						if tryEndDate != "" {
 							endDateTime, _ := time.Parse(utils.FormatDate, tryEndDate)
 							endDateTime = endDateTime.AddDate(0, 0, 1)
@@ -474,9 +498,9 @@ func (this *CompanyController) CompanyShareList() {
 						} else {
 							tryExpireDay = "-"
 						}
-					} else if raiStatus == utils.COMPANY_STATUS_LOSE { //流失
+					} else if strings.Contains(raiStatus, utils.COMPANY_STATUS_LOSE) { //流失
 						tryExpireDay = "-"
-					} else if raiStatus == utils.COMPANY_STATUS_FREEZE { //冻结
+					} else if strings.Contains(raiStatus, utils.COMPANY_STATUS_FREEZE) { //冻结
 						if item.StartDate != "" && item.EndDate != "" {
 							endDateTime, _ := time.Parse(utils.FormatDate, tryEndDate)
 							endDateTime = endDateTime.AddDate(0, 0, 0)
@@ -509,7 +533,7 @@ func (this *CompanyController) CompanyShareList() {
 		}
 		list[i].BtnItem = btnItem
 
-		if item.FreezeStartDate != "" && item.FreezeEndDate != "" && item.Status == utils.COMPANY_STATUS_FREEZE {
+		if item.FreezeStartDate != "" && item.FreezeEndDate != "" && strings.Contains(item.Status, utils.COMPANY_STATUS_FREEZE) {
 			freezeEndDate, _ := time.Parse(utils.FormatDate, item.FreezeEndDate)
 			if time.Now().Before(freezeEndDate) {
 				expireDays := freezeEndDate.Sub(time.Now()).Hours() / 24
@@ -559,16 +583,13 @@ func (this *CompanyController) CompanyShareList() {
 			//viewTotal:=GetviewTotal(v.CompanyId)
 
 			//活跃（客户状态）
-			tmpStatus := v.Status
-			if v.IsShare == 1 {
-				tmpStatus = v.Status + "(共享)"
-			} else {
+			if v.IsShare != 1 {
 				if v.BtnItem.BtnModifySeller == true {
 					v.BtnItem.BtnModifySeller = false
 				}
 			}
 
-			if v.IsShare == 1 && v.BtnItem.BtnModifySeller == true {
+			if v.IsShare == 1 && v.BtnItem.BtnModifySeller == true && sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_ADMIN {
 				//如果已经是共享客户了，取消共享按钮全都显示，和修改销售权限一样
 				v.BtnItem.BtnShare = true
 			}
@@ -584,7 +605,7 @@ func (this *CompanyController) CompanyShareList() {
 				RenewalReason:    v.RenewalReason,
 				FreezeReason:     v.FreezeReason,
 				LossTime:         v.LossTime,
-				Status:           tmpStatus,
+				Status:           v.Status,
 				CompanyType:      v.CompanyType,
 				ApproveStatus:    v.ApproveStatus,
 				SellerName:       v.SellerName,
@@ -628,11 +649,25 @@ func (this *CompanyController) CompanyShareList() {
 				Deadline:        v.Deadline,
 				WeekViewActive:  v.WeekViewActive,
 				IsShare:         v.IsShare,
-				ShareSeller:     v.ShareSeller,
 				ShareSellerId:   v.ShareSellerId,
 				LastServiceTime: v.LastServiceTime,
 				ServiceTimes:    v.ServiceTimes,
 			}
+			if v.ShareSellerIds != "" {
+				shareSellerIds := strings.Split(v.ShareSellerIds, ",")
+				for _, idStr := range shareSellerIds {
+					shareSellerId, e := strconv.Atoi(idStr)
+					if e != nil {
+						err = e
+						return
+					}
+					shareSeller := adminMap[shareSellerId]
+					if shareSeller != nil {
+						companyList.ShareSeller += shareSeller.RealName + "(" + shareSeller.GroupName + ")" + "/"
+					}
+				}
+				companyList.ShareSeller = strings.TrimRight(companyList.ShareSeller, "/")
+			}
 			companyLists = append(companyLists, companyList)
 		}
 	}
@@ -700,9 +735,14 @@ func (this *CompanyController) MoveShareSeller() {
 		br.ErrMsg = "获取销售信息失败,Err:" + err.Error()
 		return
 	}
-
+	productId := services.GetProductId(sysUser.RoleTypeCode)
+	if productId == 0 {
+		br.Msg = "该角色非ficc或权益角色"
+		br.ErrMsg = "该角色非ficc或权益角色"
+		return
+	}
 	//查询该客户
-	companyItem, err := company.GetCompanyById(req.CompanyId)
+	companyProductItem, err := company.GetCompanyProductByCompanyIdAndProductId(req.CompanyId, productId)
 	if err != nil {
 		br.Msg = "查找客户失败"
 		br.ErrMsg = "查找客户失败,Err:" + err.Error()
@@ -711,11 +751,11 @@ func (this *CompanyController) MoveShareSeller() {
 
 	//待更新字段
 	updateCol := make([]string, 0)
-	companyItem.ShareSeller = seller.RealName
-	companyItem.ShareSellerId = seller.AdminId
+	companyProductItem.ShareSeller = seller.RealName
+	companyProductItem.ShareSellerId = seller.AdminId
 	updateCol = append(updateCol, "ShareSeller", "ShareSellerId")
 
-	err = companyItem.Update(updateCol)
+	err = companyProductItem.Update(updateCol)
 	if err != nil {
 		br.Msg = "修改客户信息失败"
 		br.ErrMsg = "修改客户信息失败,Err:" + err.Error()
@@ -932,7 +972,7 @@ func (this *CompanyController) CompanyShareListByCity() {
 		}
 	}
 
-	condition += ` AND a.is_share=1 `
+	condition += ` AND b.is_share=1 `
 	if province != "" {
 		var provinceSql string
 		slice := strings.Split(province, ",")
@@ -959,7 +999,16 @@ func (this *CompanyController) CompanyShareListByCity() {
 		br.ErrMsg = "获取数据总数失败，Err:" + err.Error()
 		return
 	}
-
+	sysUserList, err := system.GetAdminList()
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取admin列表失败, Err:" + err.Error()
+		return
+	}
+	adminMap := make(map[int]*system.Admin, 0)
+	for _, v := range sysUserList {
+		adminMap[v.AdminId] = v
+	}
 	sortStr := ` `
 	//if sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_ADMIN {
 	//	sortStr = " ORDER BY sort_status asc, all_view_total desc, a.created_time "
@@ -1014,9 +1063,10 @@ func (this *CompanyController) CompanyShareListByCity() {
 			//viewTotal:=GetviewTotal(v.CompanyId)
 
 			//活跃（客户状态）
-			tmpStatus := v.Status
-			if v.IsShare == 1 {
-				tmpStatus = v.Status + "(共享)"
+			if v.IsShare != 1 {
+				if v.BtnItem.BtnModifySeller == true {
+					v.BtnItem.BtnModifySeller = false
+				}
 			}
 
 			companyList := &company.CompanyListItem{
@@ -1030,7 +1080,7 @@ func (this *CompanyController) CompanyShareListByCity() {
 				RenewalReason:    v.RenewalReason,
 				FreezeReason:     v.FreezeReason,
 				LossTime:         v.LossTime,
-				Status:           tmpStatus,
+				Status:           v.Status,
 				CompanyType:      v.CompanyType,
 				ApproveStatus:    v.ApproveStatus,
 				SellerName:       v.SellerName,
@@ -1074,11 +1124,25 @@ func (this *CompanyController) CompanyShareListByCity() {
 				Deadline:        v.Deadline,
 				WeekViewActive:  v.WeekViewActive,
 				IsShare:         v.IsShare,
-				ShareSeller:     v.ShareSeller,
 				ShareSellerId:   v.ShareSellerId,
 				LastServiceTime: v.LastServiceTime,
 				ServiceTimes:    v.ServiceTimes,
 			}
+			if v.ShareSellerIds != "" {
+				shareSellerIds := strings.Split(v.ShareSellerIds, ",")
+				for _, idStr := range shareSellerIds {
+					shareSellerId, e := strconv.Atoi(idStr)
+					if e != nil {
+						err = e
+						return
+					}
+					shareSeller := adminMap[shareSellerId]
+					if shareSeller != nil {
+						companyList.ShareSeller += shareSeller.RealName + "(" + shareSeller.GroupName + ")" + "/"
+					}
+				}
+				companyList.ShareSeller = strings.TrimRight(companyList.ShareSeller, "/")
+			}
 			companyLists = append(companyLists, companyList)
 		}
 	}

controllers/company_user.go

@@ -93,25 +93,23 @@ func (this *CompanyUserController) AddUser() {
 		return
 	}
 	regionType := req.RegionType //区域来源
+	productId := services.GetProductId(sysUser.RoleTypeCode)
 
 	//操作员的产品权限
 	companyProductList := make([]*company.CompanyProduct, 0)
 
-	shareSellerId := 0
-	companyInfo := new(company.Company)
+	var companyInfo *company.Company
+	var e error
 	if req.CompanyId > 0 {
-		item, e := company.GetCompanyById(req.CompanyId)
+		companyInfo, e = company.GetCompanyById(req.CompanyId)
 		if e != nil {
 			br.Msg = "客户信息有误"
 			br.ErrMsg = "获取客户信息失败, Err: " + e.Error()
 			return
 		}
-		companyInfo = item
-		shareSellerId = item.ShareSellerId
 	}
 
 	//权益类客户，邮箱必填（2021-03-22 13:32:59修改）
-	productId := services.GetProductId(sysUser.RoleTypeCode)
 	if productId == 1 || regionType == "国内" { //ficc类客户
 		if req.MobileOne == "" && req.Email == "" {
 			br.Msg = "请输入手机号或邮箱"
@@ -206,6 +204,16 @@ func (this *CompanyUserController) AddUser() {
 			}
 			companyProductList = append(companyProductList, tmpCompanyProduct)
 		} else if req.Source == "add_user" {
+			shareSellerId := 0
+			if req.CompanyId > 0 {
+				item, e := company.GetCompanyProductByCompanyIdAndProductId(req.CompanyId, productId)
+				if e != nil {
+					br.Msg = "客户信息有误"
+					br.ErrMsg = "获取客户信息失败, Err: " + e.Error()
+					return
+				}
+				shareSellerId = item.ShareSellerId
+			}
 			//获取当前操作员产品权限
 			tmpCompanyProductList, productErr := getSysCompanyProductList(productId, req.CompanyId)
 			if productErr != nil {
@@ -1638,16 +1646,11 @@ func (this *CompanyUserController) EditUser() {
 		br.ErrMsg = "获取当前操作员找不到产品权限"
 		return
 	}
-	item, err := company.GetCompanyDetailById(wxUser.CompanyId)
-	if err != nil {
-		br.Msg = "获取信息失败"
-		br.ErrMsg = "获取数据失败，Err:" + err.Error()
-		return
-	}
+
 	//操作权限校验
 	for _, v := range companyProductList {
-		companyUserStatus := services.CheckCompanyUserButton(sysUser.RoleTypeCode, v.SellerId, sysUser.AdminId, v.ProductId, item.ShareSellerId, v.Status)
-		if item.ShareSellerId == sysUser.AdminId {
+		companyUserStatus := services.CheckCompanyUserButton(sysUser.RoleTypeCode, v.SellerId, sysUser.AdminId, v.ProductId, v.ShareSellerId, v.Status)
+		if v.ShareSellerId == sysUser.AdminId {
 			companyUserStatus = true
 		}
 		if companyUserStatus == false {
@@ -3190,7 +3193,8 @@ func (this *CompanyUserController) ViewReportList() {
 			} else {
 				lastViewTimeT = time.Now()
 			}
-			lastViewTime = lastViewTimeT.Format(utils.FormatDateTime)
+			// 默认要把最新的记录列出来，所以往后加1s
+			lastViewTime = lastViewTimeT.Add(1 * time.Second).Format(utils.FormatDateTime)
 		}
 	// 权益
 	case 2: // ficc
@@ -3204,7 +3208,8 @@ func (this *CompanyUserController) ViewReportList() {
 			} else {
 				lastViewTimeT = time.Now()
 			}
-			lastViewTime = lastViewTimeT.Format(utils.FormatDateTime)
+			// 默认要把最新的记录列出来，所以往后加1s
+			lastViewTime = lastViewTimeT.Add(1 * time.Second).Format(utils.FormatDateTime)
 		}
 	default:
 		if lastViewTimeT.IsZero() {
@@ -3374,7 +3379,18 @@ func (this *CompanyUserController) ViewReportList() {
 	for _, v := range recordList {
 		tmpKey := fmt.Sprint(v.Source, "_", v.ReportId)
 		if tmpInfo, ok := viewReportMap[tmpKey]; ok {
-			list = append(list, &tmpInfo)
+			stopTime := `--`
+			if v.StopTime > 0 {
+				stopTime = fmt.Sprint(v.StopTime)
+			}
+			list = append(list, &company.ViewReportList{
+				ResearchReportName: tmpInfo.ResearchReportName,
+				ReportType:         tmpInfo.ReportType,
+				CreatedTime:        v.CreateTime,
+				TxtType:            tmpInfo.TxtType,
+				MatchTypeName:      tmpInfo.MatchTypeName,
+				StopTime:           stopTime,
+			})
 		}
 	}
 
@@ -5035,13 +5051,10 @@ func checkOpCompanyUserByUserId(userId, productId, opId int, roleTypeCode string
 		err = errors.New("删除失败，获取当前操作员找不到产品权限")
 		return
 	}
-	item, err := company.GetCompanyDetailById(userInfo.CompanyId)
-	if err != nil {
-		return
-	}
+
 	//操作权限校验
 	for _, v := range companyProductList {
-		companyUserStatus := services.CheckCompanyUserButton(roleTypeCode, v.SellerId, opId, v.ProductId, item.ShareSellerId, v.Status)
+		companyUserStatus := services.CheckCompanyUserButton(roleTypeCode, v.SellerId, opId, v.ProductId, v.ShareSellerId, v.Status)
 		if companyUserStatus == false {
 			errMsg = "没有操作权限"
 			err = errors.New("没有操作权限")
@@ -5065,13 +5078,9 @@ func checkOpCompanyUserByCompanyId(companyId, productId, opId int, roleTypeCode
 		err = errors.New("删除失败，获取当前操作员找不到产品权限")
 		return
 	}
-	item, err := company.GetCompanyDetailById(companyId)
-	if err != nil {
-		return
-	}
 	//操作权限校验
 	for _, v := range companyProductList {
-		companyUserStatus := services.CheckCompanyUserButton(roleTypeCode, v.SellerId, opId, v.ProductId, item.ShareSellerId, v.Status)
+		companyUserStatus := services.CheckCompanyUserButton(roleTypeCode, v.SellerId, opId, v.ProductId, v.ShareSellerId, v.Status)
 		if companyUserStatus == false {
 			errMsg = "没有操作权限"
 			err = errors.New("没有操作权限")

controllers/contract/contract.go

@@ -78,6 +78,7 @@ func (this *ContractController) GetServiceTemplateList() {
 				br.ErrMsg = "获取详情模板失败，Err:" + err.Error()
 				return
 			}
+
 			tmpList[j].Detail = detail
 			// 权益存在第三级主客观套餐-CRM8.8
 			thirdList, e := contract.GetContractServiceTemplateMapByParentId(tmpList[j].ServiceTemplateId)
@@ -123,6 +124,44 @@ func (this *ContractController) GetServiceTemplateList() {
 			br.ErrMsg = "获取详情模板失败，Err:" + err.Error()
 			return
 		}
+		if productId == 1 && list[i].ServiceTemplateId == 2 {
+			// 特殊处理Ficc周报、商品双周报、数据点评的套餐显示
+			// 把detail转成go struct
+			// 查询默认的公有权限
+			publicPermissionList, tmpE := models.GetFiccPermissionSecondPublic()
+			if tmpE != nil {
+				br.Msg = "获取失败"
+				br.ErrMsg = "获取默认的公有权限失败，Err:" + tmpE.Error()
+				return
+			}
+			publicPermissionIds := make([]int, 0)
+			publicPermissionNames := make([]string, 0)
+			for _, v := range publicPermissionList {
+				publicPermissionIds = append(publicPermissionIds, v.ChartPermissionId)
+				publicPermissionNames = append(publicPermissionNames, v.PermissionName)
+			}
+			for k, v := range detail {
+				if v.Id == 4 || v.Id == 5 || v.Id == 6 {
+					detailStruct := new(contract.ServiceTemplateDetailCol2)
+					e := json.Unmarshal([]byte(v.Col2), detailStruct)
+					if e != nil {
+						br.Msg = "获取失败"
+						br.ErrMsg = "获取套餐信息失败, json.Unmarshal Err: " + e.Error()
+						return
+					}
+					//替换默认品种
+					detailStruct.ValueId = publicPermissionIds
+					detailStruct.Value = strings.Join(publicPermissionNames, ",")
+					newCol2, e := json.Marshal(detailStruct)
+					if e != nil {
+						br.Msg = "获取失败"
+						br.ErrMsg = "获取套餐信息失败, json.Marshal Err: " + e.Error()
+						return
+					}
+					detail[k].Col2 = string(newCol2)
+				}
+			}
+		}
 		if productId == 1 && contractType == "补充协议" {
 			for _, v := range detail {
 				//ficc 的合同模板的 补充协议需要将默认的宏观经济给移除掉
@@ -862,14 +901,20 @@ func contractListExport(this *ContractController, list []*contract.ContractList,
 					}
 
 					permissionList := make([]*company.PermissionSetItem, 0)
-					for _, v := range utils.PermissionFiccClassifyArr {
-						items, err := company.GetPermissionSetItems(1, v)
-						if err != nil {
-							br.Msg = "获取失败"
-							br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
-							return
+					allPermissions, permissionMap, e := services.GetBaseFiccPermissionSetItem()
+					if e != nil {
+						br.Msg = "查询基础权限失败"
+						br.ErrMsg = "查询基础权限失败,Err:" + e.Error()
+						return
+					}
+					//遍历获取
+					for _, v := range allPermissions {
+						if v.ParentId == 0 {
+							items, ok := permissionMap[v.ChartPermissionId]
+							if ok {
+								permissionList = append(permissionList, items...)
+							}
 						}
-						permissionList = append(permissionList, items...)
 					}
 
 					//权限列表
@@ -1611,7 +1656,7 @@ func (this *ContractController) Detail() {
 	if isNeedPermission {
 		checkPermissionMap, tErr := contractService.GetServicePermissionMap(contractInfo.Service)
 		if tErr == nil {
-			permissionLookListMap := make(map[string][]*contract.PermissionLookItem)
+			permissionLookListMap := make(map[int][]*contract.PermissionLookItem)
 			var permissionIds []string
 			for _, v := range checkPermissionMap {
 				permissionIds = append(permissionIds, strconv.Itoa(v))
@@ -1624,12 +1669,12 @@ func (this *ContractController) Detail() {
 					tmp.ClassifyName = v.ClassifyName
 					tmp.PermissionName = v.PermissionName
 					tmp.ChartPermissionId = v.ChartPermissionId
-					permissionLookListMap[v.ClassifyName] = append(permissionLookListMap[v.ClassifyName], tmp)
+					permissionLookListMap[v.ParentId] = append(permissionLookListMap[v.ParentId], tmp)
 				}
 				classifyNameList, tErr2 := company.GetChartPermissionFirst()
 				if tErr2 == nil {
 					for _, v := range classifyNameList {
-						if perList, ok := permissionLookListMap[v.ClassifyName]; ok {
+						if perList, ok := permissionLookListMap[v.ChartPermissionId]; ok {
 							permissionLookListRespItem := &contract.PermissionLookList{
 								ClassifyName: v.ClassifyName,
 								Items:        perList,
@@ -2544,7 +2589,7 @@ func (this *ContractController) BusinessContractCompanyList() {
 		cond := ` AND share_seller_id = ? AND is_share = 1 AND company_name LIKE ?`
 		pars := make([]interface{}, 0)
 		pars = append(pars, sysUser.AdminId, kw)
-		shares, e := company.GetCompanyListByCondition(cond, pars, []string{"company_id", "company_name"}, "")
+		shares, e := company.GetCompanyProductList(cond, pars)
 		if e != nil {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取共享客户信息失败, Err: " + e.Error()
@@ -2602,7 +2647,7 @@ func (this *ContractController) BusinessContractListByCompanyName() {
 	//pars = append(pars, sysUser.AdminId)
 
 	// 13.6正式共享客户-可以选择分配给自己的共享客户下的非自己创建的合同
-	joinStr := ` LEFT JOIN company AS b ON a.company_name = b.company_name `
+	joinStr := ` LEFT JOIN company_product AS b ON a.company_name = b.company_name `
 	condition += ` AND (a.seller_id = ? OR (b.is_share = 1 AND b.share_seller_id = ?))`
 	pars = append(pars, sysUser.AdminId, sysUser.AdminId)
 
@@ -2869,7 +2914,7 @@ func (this *ContractController) GetListBySeal() {
 	}
 
 	// 13.6正式共享客户
-	joinStr := ` LEFT JOIN company AS b ON a.company_name = b.company_name `
+	joinStr := ` LEFT JOIN company_product AS b ON a.company_name = b.company_name `
 	// 非合规角色可查看自己的合同或是自己的共享客户下的非自己创建的合同
 	if sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_COMPLIANCE {
 		condition += ` AND (a.seller_id = ? OR (b.is_share = 1 AND b.share_seller_id = ?))`
@@ -2998,7 +3043,7 @@ func (this *ContractController) DetailMerge() {
 	if isNeedPermission {
 		checkPermissionMap, tErr := contractService.GetServicePermissionMap(contractInfo.Service)
 		if tErr == nil {
-			permissionLookListMap := make(map[string][]*contract.PermissionLookItem)
+			permissionLookListMap := make(map[int][]*contract.PermissionLookItem)
 			var permissionIds []string
 			for _, v := range checkPermissionMap {
 				permissionIds = append(permissionIds, strconv.Itoa(v))
@@ -3011,12 +3056,12 @@ func (this *ContractController) DetailMerge() {
 					tmp.ClassifyName = v.ClassifyName
 					tmp.PermissionName = v.PermissionName
 					tmp.ChartPermissionId = v.ChartPermissionId
-					permissionLookListMap[v.ClassifyName] = append(permissionLookListMap[v.ClassifyName], tmp)
+					permissionLookListMap[v.ParentId] = append(permissionLookListMap[v.ParentId], tmp)
 				}
 				classifyNameList, tErr2 := company.GetChartPermissionFirst()
 				if tErr2 == nil {
 					for _, v := range classifyNameList {
-						if perList, ok := permissionLookListMap[v.ClassifyName]; ok {
+						if perList, ok := permissionLookListMap[v.ChartPermissionId]; ok {
 							permissionLookListRespItem := &contract.PermissionLookList{
 								ClassifyName: v.ClassifyName,
 								Items:        perList,

controllers/contract/contract_approval.go

@@ -624,7 +624,22 @@ func contractApprovalListExport(this *ContractApprovalController, list []*contra
 					}
 
 					permissionList := make([]*company.PermissionSetItem, 0)
-					for _, v := range utils.PermissionFiccClassifyArr {
+					allPermissions, permissionMap, e := services.GetBaseFiccPermissionSetItem()
+					if e != nil {
+						br.Msg = "查询基础权限失败"
+						br.ErrMsg = "查询基础权限失败,Err:" + e.Error()
+						return
+					}
+					//遍历获取
+					for _, v := range allPermissions {
+						if v.ParentId == 0 {
+							items, ok := permissionMap[v.ChartPermissionId]
+							if ok {
+								permissionList = append(permissionList, items...)
+							}
+						}
+					}
+					/*for _, v := range utils.PermissionFiccClassifyArr {
 						items, err := company.GetPermissionSetItems(1, v)
 						if err != nil {
 							br.Msg = "获取失败"
@@ -632,7 +647,7 @@ func contractApprovalListExport(this *ContractApprovalController, list []*contra
 							return
 						}
 						permissionList = append(permissionList, items...)
-					}
+					}*/
 
 					//权限列表
 					for j := 0; j < len(permissionList); j++ {
@@ -1259,7 +1274,22 @@ func (this *ContractApprovalController) Export() {
 					}
 
 					permissionList := make([]*company.PermissionSetItem, 0)
-					for _, v := range utils.PermissionFiccClassifyArr {
+					allPermissions, permissionMap, e := services.GetBaseFiccPermissionSetItem()
+					if e != nil {
+						br.Msg = "查询基础权限失败"
+						br.ErrMsg = "查询基础权限失败,Err:" + e.Error()
+						return
+					}
+					//遍历获取
+					for _, v := range allPermissions {
+						if v.ParentId == 0 {
+							items, ok := permissionMap[v.ChartPermissionId]
+							if ok {
+								permissionList = append(permissionList, items...)
+							}
+						}
+					}
+					/*for _, v := range utils.PermissionFiccClassifyArr {
 						items, err := company.GetPermissionSetItems(1, v)
 						if err != nil {
 							br.Msg = "获取失败"
@@ -1268,7 +1298,7 @@ func (this *ContractApprovalController) Export() {
 						}
 						permissionList = append(permissionList, items...)
 					}
-
+					*/
 					//权限列表
 					for j := 0; j < len(permissionList); j++ {
 						key := fmt.Sprint(item.ServiceTemplateId, "_permission_", permissionList[j].ChartPermissionId)

controllers/cygx/activity.go

@@ -810,6 +810,7 @@ func (this *ActivityCoAntroller) PreserveAndPublish() {
 				go cygxService.YiDongSaveRoadshowDetail(v)
 				go cygxService.YanXuanActivityPointsBillActivityPublishAndCancel(v, AdminUser.AdminId, 1) //活动发布以及取消发布处理研选扣
 				go elastic.AddComprehensiveActivity(v)
+				go cygxService.MakeActivityMomentsImg(v) //生成活动分享到朋友圈的图片
 				//}()
 			}
 			go cygxService.MakeActivitySigninImg(v)
@@ -821,6 +822,7 @@ func (this *ActivityCoAntroller) PreserveAndPublish() {
 			go cygxService.YanXuanActivityPointsBillActivityPublishAndCancel(activityId, AdminUser.AdminId, 1) //活动发布以及取消发布处理研选扣点
 		}
 		cygxService.UpdateActivityResourceData(req.ActivityId) //写入首页最新  cygx_resource_data 表
+		go cygxService.MakeActivityMomentsImg(req.ActivityId)  //生成活动分享到朋友圈的图片
 		//如果二次编辑的时候，取消了易董办会选项，那么就对易董发送取消发布到广场的通知
 		if req.IsYidongConduct == 0 {
 			go cygxService.YiDongUpdateActivityStatus(activityId)

controllers/cygx/contract_allocation.go

@@ -814,7 +814,7 @@ func (this *ContractAllocationController) CompanyContracUpdate() {
 		itemPermission.AdminName = sysUser.RealName
 		itemPermission.Proportion = v.Proportion
 		itemPermission.Money = v.Money
-		if v.ChartPermissionName != utils.CHART_PERMISSION_NAME_MF_YANXUAN {
+		if v.ChartPermissionName != utils.YAN_XUAN_KOU_DIAN_BAO_NAME {
 			itemPermission.MoneyAvg = moneyAvg
 			if v.Money < moneyAvg/2 {
 				br.Msg = "单行业占比值不得低于平均值的一半"

controllers/cygx/summary_manage.go

@@ -318,6 +318,7 @@ func (this *SummaryManage) PreserveAndPublish() {
 	}
 	go elastic.AddComprehensiveArticle(item.ArticleId)       // ES添加文章：报告、纪要
 	go cygxService.UpdateArticleResourceData(item.ArticleId) //写入首页最新  cygx_resource_data 表
+	go cygxService.MakeArticleMomentsImg(item.ArticleId)     //生成文章分享到朋友圈的图片
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "操作成功"

controllers/cygx/user_admin_share_history.go

@@ -0,0 +1,144 @@
+package cygx
+
+import (
+	"github.com/rdlucklib/rdluck_tools/paging"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/cygx"
+	"hongze/hz_crm_api/utils"
+	"strconv"
+)
+
+// 分享记录
+type UserAdminShareHistoryController struct {
+	controllers.BaseAuthController
+}
+
+// @Title 分享记录列表
+// @Description 分享记录列表接口
+// @Param   PageSize   query   int  true       "每页数据条数"
+// @Param   CurrentIndex   query   int  true       "当前页页码，从1开始"
+// @Param   StartDate   query   string  false       "开始时间 ，列如2021-03-06 "
+// @Param   EndDate   query   string  false       "结束时间，列如2021-03-06 "
+// @Param   AdminId   query   string  false       "销售ID "
+// @Param   KeyWord   query   string  false       "搜索关键词"
+// @Success Ret=200 {object} cygx.GetCygxUserAdminShareHistoryListResp
+// @router /mfyx/admin/share/list [get]
+func (this *UserAdminShareHistoryController) OrderList() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+	resp := new(cygx.GetCygxUserAdminShareHistoryListResp)
+	pageSize, _ := this.GetInt("PageSize")
+	currentIndex, _ := this.GetInt("CurrentIndex")
+	startDate := this.GetString("StartDate")
+	endDate := this.GetString("EndDate")
+	adminId := this.GetString("AdminId")
+	keyWord := this.GetString("KeyWord")
+
+	var startSize int
+	if pageSize <= 0 {
+		pageSize = utils.PageSize20
+	}
+	if currentIndex <= 0 {
+		currentIndex = 1
+	}
+	startSize = utils.StartIndex(currentIndex, pageSize)
+	var condition string
+	var pars []interface{}
+	condition += ` AND  company_id !=  16 ` // 过滤弘则
+	if startDate != "" && endDate != "" {   //时间范围
+		startDate += " 00:00:00"
+		endDate += " 23:59:59"
+		condition += ` 	AND create_time  BETWEEN ?   AND  ? `
+		pars = append(pars, startDate, endDate)
+	}
+
+	if adminId != "" { //所属销售筛选
+		condition += ` 	AND share_id IN (` + adminId + `) `
+	}
+
+	//如果不是权益管理员和admin，就做可见权限限制
+	if sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_RAI_ADMIN && sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_ADMIN {
+		condition += ` 	AND share_id IN (` + strconv.Itoa(sysUser.AdminId) + `) `
+	}
+
+	if keyWord != "" { //用户姓名，手机号
+		keyWord = "%" + keyWord + "%"
+		condition += ` 	AND (mobile LIKE ?  OR  real_name LIKE ? ) `
+		pars = append(pars, keyWord, keyWord)
+	}
+
+	total, err := cygx.GetCygxUserAdminShareHistoryCount(condition, pars)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败，Err:" + err.Error()
+		return
+	}
+	condition += "	ORDER BY user_admin_share_history_id  DESC "
+	list, err := cygx.GetCygxUserAdminShareHistoryList(condition, pars, startSize, pageSize)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败，Err:" + err.Error()
+		return
+	}
+	var mobiles []string
+	for _, v := range list {
+		mobiles = append(mobiles, v.Mobile)
+	}
+	listUser, err := models.GetWxUserRaiSllerListByUserMobile(mobiles)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取数据失败，Err:" + err.Error()
+		return
+	}
+	//获取用户当前最新的公司信息
+	mapWxUserSller := make(map[string]*models.WxUserSller)
+	for _, v := range listUser {
+		mapWxUserSller[v.Mobile] = v
+	}
+
+	for _, v := range list {
+		switch v.Source {
+		case utils.CYGX_OBJ_ARTICLE: //文章详情
+			v.HttpUrl = utils.CYGX_MFYX_URL + "/material/info/" + strconv.Itoa(v.SourceId)
+		case utils.CYGX_OBJ_ACTIVITY: //活动详情
+			v.HttpUrl = utils.CYGX_MFYX_URL + "/activity/detail/" + strconv.Itoa(v.SourceId)
+		case utils.CYGX_OBJ_YANXUANSPECIAL: //研选专栏
+			v.HttpUrl = utils.CYGX_MFYX_URL + "/column/detail/" + strconv.Itoa(v.SourceId)
+		}
+
+		switch v.RegisterPlatform {
+		case 5:
+			v.RegisterPlatformText = "研选小程序"
+		case 6:
+			v.RegisterPlatformText = "研选网页版"
+		}
+		mapItem := mapWxUserSller[v.Mobile]
+		if mapItem != nil {
+			v.CompanyName = mapItem.CompanyName
+			v.CompanyId = mapItem.CompanyId
+			v.RealName = mapItem.RealName
+		} else {
+			v.RealName = "--"
+			v.CompanyName = "--"
+			v.CompanyId = 1
+		}
+	}
+	page := paging.GetPaging(currentIndex, pageSize, total)
+	resp.Paging = page
+	resp.List = list
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+	br.Data = resp
+}

controllers/cygx/yanxuan_special.go

@@ -79,6 +79,8 @@ func (this *YanxuanSpecialController) Add() {
 		MobileInit:  infoUser.Mobile,
 		CompanyName: infoUser.CompanyName,
 		CompanyId:   infoUser.CompanyId,
+		InviteName:  req.InviteName,
+		Remark:      req.Remark,
 		CreateTime:  time.Now(),
 		ModifyTime:  time.Now(),
 		HeadImg:     utils.CYGX_YANXUAN_SPECIAL_HEAD_IMG_URL + strconv.Itoa(rnd) + ".png",
@@ -157,6 +159,7 @@ func (this *YanxuanSpecialController) AuthorEnable() {
 // @Param   CurrentIndex   query   int  true       "当前页页码，从1开始"
 // @Param   Status   query   string  true       "状态： 1:启用 、 2:禁用 。传其他默认所有"
 // @Param   KeyWord   query   string  false       "搜索关键词"
+// @Param   NickName   query   string  false       "昵称"
 // @Param   SortParam   query   string  false       "排序字段参数，用来排序的字段， 枚举值：'CreatTime':开通时间 、 'articleNum':已发布文章 、 'pv':总Pv/Uv "
 // @Param   SortType   query   string  true       "如何排序，是正序还是倒序，枚举值：`asc 正序`,`desc 倒叙`"
 // @Success 200 {object} models.AddEnglishReportResp
@@ -182,6 +185,7 @@ func (this *YanxuanSpecialController) AuthorList() {
 	//排序参数
 	sortParam := this.GetString("SortParam")
 	sortType := this.GetString("SortType")
+	nickName := this.GetString("NickName")
 
 	var startSize int
 	if pageSize <= 0 {
@@ -206,6 +210,13 @@ func (this *YanxuanSpecialController) AuthorList() {
 		pars = append(pars, keyWord)
 	}
 
+	//关键词搜索
+	if nickName != "" {
+		nickName = "%" + nickName + "%"
+		condition += ` AND art.nick_name like  ? `
+		pars = append(pars, nickName)
+	}
+
 	//排序字段以及排序方式处理
 	var sortStr string
 	if sortParam != "" && sortType != "" {
@@ -312,6 +323,7 @@ func (this *YanxuanSpecialController) AuthorList() {
 // @Param   Status   query   string  true       "状态： 1:待审核 、 2:已发布 。默认待审核"
 // @Param   Type   query   int  true       "文章类型，1：笔记、2：观点"
 // @Param   KeyWord   query   string  false       "搜索关键词"
+// @Param   NickName   query   string  false       "昵称"
 // @Param   SortParam   query   string  false       "排序字段参数，用来排序的字段， 枚举值：'CreatTime':开通时间 、 'articleNum':已发布文章 、 'pv':总Pv/Uv "
 // @Param   SortType   query   string  true       "如何排序，是正序还是倒序，枚举值：`asc 正序`,`desc 倒叙`"
 // @Param   StartDate   query   string  false       "开始时间 ，列如2021-03-06 "
@@ -343,6 +355,7 @@ func (this *YanxuanSpecialController) List() {
 	sortType := this.GetString("SortType")
 	startDate := this.GetString("StartDate")
 	endDate := this.GetString("EndDate")
+	nickName := this.GetString("NickName")
 
 	var startSize int
 	if pageSize <= 0 {
@@ -386,6 +399,13 @@ func (this *YanxuanSpecialController) List() {
 		pars = append(pars, keyWord)
 	}
 
+	//昵称搜索
+	if nickName != "" {
+		nickName = "%" + nickName + "%"
+		condition += ` AND b.nick_name like  ? `
+		pars = append(pars, nickName)
+	}
+
 	//排序字段以及排序方式处理
 	var sortStr string
 	if sortParam != "" && sortType != "" {
@@ -874,3 +894,95 @@ func init_928() {
 	}
 	return
 }
+
+// @Title 修改作者信息
+// @Description 修改作者信息接口
+// @Param	request	body help_doc.AddHelpDocReq true "type json string"
+// @router /yanxuan_special/author/update [post]
+func (this *YanxuanSpecialController) AuthorUpdate() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+	var req cygx.AddCygxYanxuanSpecialAuthorReq
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	if err != nil {
+		br.Msg = "参数解析异常！"
+		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+		return
+	}
+	if req.UserId <= 0 {
+		br.Msg = "请输入用户信息"
+		return
+	}
+	err = cygx.UpdateYanxuanSpecialAuthorInviteName(req.InviteName, req.Remark, req.UserId)
+	if err != nil {
+		br.Msg = "新增失败"
+		br.ErrMsg = "新增失败，Err:" + err.Error()
+		return
+	}
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "修改成功"
+}
+
+// @Title 作者列表
+// @Description 作者列表
+// @Param   KeyWord   query   string  false       "搜索关键词"
+// @Success 200 {object} models.AddEnglishReportResp
+// @router /yanxuan_special/author/search [get]
+func (this *YanxuanSpecialController) AuthorSearch() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+
+	keyWord := this.GetString("KeyWord")
+	var condition string
+	var pars []interface{}
+	resp := new(cygx.CygxYanxuanSpecialKeyWordListReesp)
+	//关键词搜索
+	if keyWord != "" {
+		keyWord = "%" + keyWord + "%"
+		condition += ` AND art.nick_name like  ? `
+		pars = append(pars, keyWord)
+		list, tmpErr := cygx.GetYanxuanSpecialAuthorList(condition, pars, 0, 99)
+		if tmpErr != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取失败, Err:" + tmpErr.Error()
+			return
+		}
+		if len(list) > 0 {
+			for _, v := range list {
+				item := new(cygx.CygxYanxuanSpecialKeyWordReesp)
+				item.KeyWord = v.NickName
+				resp.List = append(resp.List, item)
+			}
+		} else {
+			resp.List = make([]*cygx.CygxYanxuanSpecialKeyWordReesp, 0)
+		}
+	} else {
+		resp.List = make([]*cygx.CygxYanxuanSpecialKeyWordReesp, 0)
+	}
+
+	br.Data = resp
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+}

controllers/english_report/en_permission.go

@@ -198,7 +198,7 @@ func (this *EnPermissionController) ParentList() {
 		return
 	}
 
-	cond := fmt.Sprintf(` AND %s = ?`, models.EnPermissionColumns.ParentId)
+	cond := fmt.Sprintf(` enabled = 1 AND %s = ?`, models.EnPermissionColumns.ParentId)
 	pars := make([]interface{}, 0)
 	pars = append(pars, 0)
 	ob := new(models.EnPermission)
@@ -278,7 +278,7 @@ func (this *EnPermissionController) List() {
 		limitIds = ps
 	}
 
-	cond := ``
+	cond := ` AND enabled=1 `
 	pars := make([]interface{}, 0)
 	if keyword != "" {
 		k := fmt.Sprint("%", keyword, "%")

controllers/eta_trial.go

@@ -887,7 +887,8 @@ func (this *ETATrialController) Approval() {
 
 		// 新增试用客户手工权限
 		go func() {
-			_ = services.CreateTrialUserManualAuth(newId, admin.RealName)
+			//_ = services.CreateTrialUserManualAuth(newId, admin.RealName)
+			_ = services.EtaTrialManualUserAddAuth(newId, admin.RealName)
 		}()
 	}
 

controllers/full_company.go

@@ -1128,9 +1128,10 @@ func (this *FullCompanyController) List() {
 			//viewTotal:=GetviewTotal(v.CompanyId)
 
 			//活跃（客户状态）
-			tmpStatus := v.Status
-			if v.IsShare == 1 {
-				tmpStatus = v.Status + "(共享)"
+			if v.IsShare != 1 {
+				if v.BtnItem.BtnModifySeller == true {
+					v.BtnItem.BtnModifySeller = false
+				}
 			}
 			//productIdSlice := strings.Split(v.ProductIds, "/")
 			//statusSlice := strings.Split(v.Status, "/")
@@ -1230,7 +1231,7 @@ func (this *FullCompanyController) List() {
 				RenewalReason:    v.RenewalReason,
 				FreezeReason:     v.FreezeReason,
 				LossTime:         v.LossTime,
-				Status:           tmpStatus,
+				Status:           v.StatusStr,
 				CompanyType:      v.CompanyType,
 				ApproveStatus:    v.ApproveStatus,
 				SellerName:       v.SellerName,
@@ -1281,6 +1282,7 @@ func (this *FullCompanyController) List() {
 				IsShare:         v.IsShare,
 				CloseTime:       v.CloseTime,
 				CloseReason:     v.CloseReason,
+				ShareSellerId:   v.ShareSellerId,
 			}
 			companyLists = append(companyLists, companyList)
 		}
@@ -2312,7 +2314,6 @@ func (this *FullCompanyController) Detail() {
 		br.ErrMsg = "获取数据失败，Err:" + err.Error()
 		return
 	}
-	shareSellerId := item.ShareSellerId
 	var productName string
 	productId := services.GetProductId(sysUser.RoleTypeCode)
 	// 销售经理赋予admin查看权限
@@ -2361,7 +2362,7 @@ func (this *FullCompanyController) Detail() {
 				if item.Status == utils.COMPANY_STATUS_FREEZE || item.Status == utils.COMPANY_STATUS_LOSE {
 					btnDetailItem.BtnHistoryList = true
 				} else {
-					if item.SellerId == sysUser.AdminId || shareSellerId == sysUser.AdminId {
+					if item.SellerId == sysUser.AdminId || item.ShareSellerId == sysUser.AdminId {
 						btnDetailItem.BtnHistoryList = true
 					}
 					if sysUser.Authority > 0 {
@@ -2374,51 +2375,60 @@ func (this *FullCompanyController) Detail() {
 					}
 				}
 			}
-			for _, v := range utils.PermissionFiccClassifyArr {
-				checkList := make([]int, 0)
-				plist := new(company.PermissionLookList)
-				items, err := company.GetPermissionLookItems(item.ProductId, v)
-				if err != nil {
-					br.Msg = "获取失败"
-					br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
-					return
-				}
-				for itemK, n := range items {
-					permission, err := company.GetCompanyPermissionCheckItem(companyId, n.ChartPermissionId)
-					if err != nil && err.Error() != utils.ErrNoRow() {
-						br.Msg = "获取失败"
-						br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
+			//子权限切片集合
+			allFiccPermissions, permissionMap, e := services.GetBasePermissionLookItem(utils.COMPANY_PRODUCT_FICC_ID)
+			if e != nil {
+				br.Msg = "查询基础权限失败"
+				br.ErrMsg = "查询基础权限失败,Err:" + e.Error()
+				return
+			}
+			//遍历获取
+			for _, v := range allFiccPermissions {
+				if v.ParentId == 0 {
+					checkList := make([]int, 0)
+					plist := new(company.PermissionLookList)
+					items, ok := permissionMap[v.ChartPermissionId]
+					if !ok {
+						br.Msg = "获取权限信息失败"
 						return
 					}
-					if permission != nil && permission.ChartPermissionId > 0 {
-						checkList = append(checkList, n.ChartPermissionId)
-						items[itemK].StartDate = permission.StartDate
-						items[itemK].EndDate = permission.EndDate
-						items[itemK].Status = permission.Status
+					for itemK, n := range items {
+						permission, err := company.GetCompanyPermissionCheckItem(companyId, n.ChartPermissionId)
+						if err != nil && err.Error() != utils.ErrNoRow() {
+							br.Msg = "获取失败"
+							br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
+							return
+						}
+						if permission != nil && permission.ChartPermissionId > 0 {
+							checkList = append(checkList, n.ChartPermissionId)
+							items[itemK].StartDate = permission.StartDate
+							items[itemK].EndDate = permission.EndDate
+							items[itemK].Status = permission.Status
 
-						endDateTime, _ := time.Parse(utils.FormatDate, permission.EndDate)
-						endDateTime = endDateTime.AddDate(0, 0, 1)
-						sub := endDateTime.Sub(time.Now())
-						if sub < 0 {
-							sub = 0
+							endDateTime, _ := time.Parse(utils.FormatDate, permission.EndDate)
+							endDateTime = endDateTime.AddDate(0, 0, 1)
+							sub := endDateTime.Sub(time.Now())
+							if sub < 0 {
+								sub = 0
+							}
+							expireDay := fmt.Sprintf("%v", int(sub.Hours()/24))
+							items[itemK].ExpireDay = expireDay
 						}
-						expireDay := fmt.Sprintf("%v", int(sub.Hours()/24))
-						items[itemK].ExpireDay = expireDay
+						//count, err := company.GetCompanyPermissionCheck(companyId, n.ChartPermissionId)
+						//if err != nil {
+						//	br.Msg = "获取失败"
+						//	br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
+						//	return
+						//}
+						//if count > 0 {
+						//	checkList = append(checkList, n.ChartPermissionId)
+						//}
 					}
-					//count, err := company.GetCompanyPermissionCheck(companyId, n.ChartPermissionId)
-					//if err != nil {
-					//	br.Msg = "获取失败"
-					//	br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
-					//	return
-					//}
-					//if count > 0 {
-					//	checkList = append(checkList, n.ChartPermissionId)
-					//}
+					plist.Items = items
+					plist.ClassifyName = v.PermissionName
+					plist.CheckList = checkList
+					item.PermissionList = append(item.PermissionList, plist)
 				}
-				plist.Items = items
-				plist.ClassifyName = v
-				plist.CheckList = checkList
-				item.PermissionList = append(item.PermissionList, plist)
 			}
 			resp.FiccItem = item
 			if (roleTypeCode == utils.ROLE_TYPE_CODE_FICC_SELLER ||
@@ -2469,7 +2479,8 @@ func (this *FullCompanyController) Detail() {
 				resp.IsButtonShow = 1
 			}
 		}
-		btnItem := services.GetCompanyPermissionButton(roleTypeCode, item.Status, strconv.Itoa(item.SellerId), strconv.Itoa(item.GroupId), item.GroupId, sysUser.GroupId, item.SellerId, sysUser.AdminId, sysUser.Authority, item.ProductId, shareSellerId)
+		btnItem := services.GetCompanyPermissionButton(roleTypeCode, item.Status, strconv.Itoa(item.SellerId), strconv.Itoa(item.GroupId),
+			item.GroupId, sysUser.GroupId, item.SellerId, sysUser.AdminId, sysUser.Authority, item.ProductId, item.ShareSellerId, "")
 		//if itemLen > 1 {
 		//	btnDetailItem.BtnEdit = false
 		//	btnDetailItem.BtnDelete = false
@@ -2495,7 +2506,7 @@ func (this *FullCompanyController) Detail() {
 
 		//联系人操作权限
 		if resp.IsContractButtonShow == false {
-			resp.IsContractButtonShow = services.CheckCompanyUserButton(sysUser.RoleTypeCode, item.SellerId, sysUser.AdminId, item.ProductId, shareSellerId, item.Status)
+			resp.IsContractButtonShow = services.CheckCompanyUserButton(sysUser.RoleTypeCode, item.SellerId, sysUser.AdminId, item.ProductId, item.ShareSellerId, item.Status)
 		}
 	}
 
@@ -2635,8 +2646,19 @@ func (this *FullCompanyController) PermissionLook() {
 	}
 
 	resp := new(company.PermissionLookResp)
-	permissionArr := []string{}
+	permissionArr := make([]*models.ChartPermission, 0)
+	var err error
 	if lookType == 1 {
+		permissionArr, err = services.GetPermissionFirstArr(productId)
+	} else {
+		permissionArr, err = services.GetPermissionFirstArr(0)
+	}
+	if err != nil {
+		br.Msg = "获取权限失败"
+		br.ErrMsg = "获取权限失败 err:" + err.Error()
+		return
+	}
+	/*if lookType == 1 {
 		if productId == 1 {
 			for _, permission := range utils.PermissionFiccClassifyArr {
 				permissionArr = append(permissionArr, permission)
@@ -2652,21 +2674,22 @@ func (this *FullCompanyController) PermissionLook() {
 		for _, permission := range utils.PermissionAllClassifyArr {
 			permissionArr = append(permissionArr, permission)
 		}
-	}
+	}*/
 	//ficc权限类目
 	for _, v := range permissionArr {
 		checkList := make([]int, 0)
 		p := new(company.PermissionLookList)
+		p.Items = make([]*company.PermissionLookItem, 0)
 		var productId int
 		//if v == "权益" {
 		//	productId = 2
 		//} else {
 		//	productId = 1
 		//}
-		if v != "权益" {
+		if v.PermissionName != "权益" {
 			productId = 1
 			//mapPermissionName := make(map[string]int)
-			items, err := company.GetPermissionLookItems(productId, v)
+			items, err := company.GetPermissionLookItemsByParentId(productId, v.ChartPermissionId)
 			if err != nil {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
@@ -2712,7 +2735,7 @@ func (this *FullCompanyController) PermissionLook() {
 				}
 				expireDay := fmt.Sprintf("%v", int(sub.Hours()/24))
 				items[i].ExpireDay = expireDay
-				items[i].ClassifyName = v
+				items[i].ClassifyName = v.PermissionName
 				if lookType == 1 {
 					permissionList = append(permissionList, items[i])
 				} else {
@@ -2729,7 +2752,7 @@ func (this *FullCompanyController) PermissionLook() {
 					mapPermissionNameList[v.PermissionName] = v.ChartPermissionId
 				}
 			}
-			p.ClassifyName = v
+			p.ClassifyName = v.PermissionName
 			//p.Items = permissionList
 			p.CheckList = checkList
 			if lookType == 1 {
@@ -2745,7 +2768,7 @@ func (this *FullCompanyController) PermissionLook() {
 	//权益权限类目
 	for _, v := range permissionArr {
 
-		if v == "权益" {
+		if v.PermissionName == "权益" {
 			// CRM8.8-权益权限列表调用较多、统一进行调整
 			unify := false
 			if lookType == 1 {

controllers/report.go

@@ -202,6 +202,12 @@ func (this *ReportController) SetDayWeekReportUpdateRule() {
 		br.ErrMsg = "设置暂停时间失败, Err: " + err.Error()
 		return
 	}
+	// 同步eta系统的章节更新配置
+	go func() {
+		ruleSyncReq := new(services.EditReportChapterTypeRuleSyncReq)
+		ruleSyncReq.ResearchType = researchType
+		_, _ = services.EditReportChapterTypeRuleSync(ruleSyncReq)
+	}()
 
 	br.Ret = 200
 	br.Success = true
@@ -252,6 +258,12 @@ func (this *ReportController) SetDayWeekReportEnableRule() {
 		return
 	}
 
+	// 同步eta系统的章节更新配置
+	go func() {
+		ruleSyncReq := new(services.EditReportChapterTypeRuleSyncReq)
+		_, _ = services.EditReportChapterTypeRuleSync(ruleSyncReq)
+	}()
+
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "操作成功"

controllers/report_chapter_type.go

@@ -0,0 +1,150 @@
+package controllers
+
+import (
+	"encoding/json"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/services"
+	"hongze/hz_crm_api/utils"
+)
+
+// ReportChapterTypeController 报告章节配置
+type ReportChapterTypeController struct {
+	BaseAuthController
+}
+
+// List
+// @Title 报告章节列表
+// @Description 报告章节列表
+// @Param   ReportType  query  string  true  "报告类型: day-晨报; week-周报"
+// @Success 200 {object} models.ReportChapterTypePageListResp
+// @router /chapter_type/list [get]
+func (this *ReportChapterTypeController) List() {
+	br := new(models.BaseResponse).Init()
+	br.IsSendEmail = false
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+	reportType := this.GetString("ReportType")
+	typeArr := []string{utils.REPORT_TYPE_DAY, utils.REPORT_TYPE_WEEK}
+	if !utils.InArrayByStr(typeArr, reportType) {
+		br.Msg = "请选择报告类型"
+		return
+	}
+
+	cond := ` AND research_type = ?`
+	pars := make([]interface{}, 0)
+	pars = append(pars, reportType)
+	list, e := models.GetReportChapterTypePageList(cond, pars)
+	if e != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取报告章节列表失败, Err: " + e.Error()
+		return
+	}
+	respList := make([]*models.ReportChapterTypeListItem, 0)
+	for i := range list {
+		respList = append(respList, &models.ReportChapterTypeListItem{
+			ReportChapterTypeId:   list[i].ReportChapterTypeId,
+			ReportChapterTypeName: list[i].ReportChapterTypeName,
+			Sort:                  list[i].Sort,
+			CreatedTime:           list[i].CreatedTime.Format(utils.FormatDateTime),
+			ResearchType:          list[i].ResearchType,
+			SelectedImage:         list[i].SelectedImage,
+			UnselectedImage:       list[i].UnselectedImage,
+			WordsImage:            list[i].YbBottomIcon, // 此处的不一样
+			EditImgUrl:            list[i].EditImgUrl,
+			IsShow:                list[i].IsShow,
+			Enabled:               list[i].Enabled,
+		})
+	}
+
+	resp := new(models.ReportChapterTypeListResp)
+	resp.List = respList
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+	br.Data = resp
+}
+
+// Edit
+// @Title 编辑报告章节
+// @Description 编辑报告章节
+// @Param	request  body  models.ReportChapterTypeEditReq  true  "type json string"
+// @Success 200 string "操作成功"
+// @router /chapter_type/edit [post]
+func (this *ReportChapterTypeController) Edit() {
+	br := new(models.BaseResponse).Init()
+	br.IsSendEmail = false
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+	var req models.ReportChapterTypeEditReq
+	if err := json.Unmarshal(this.Ctx.Input.RequestBody, &req); err != nil {
+		br.Msg = "参数解析异常！"
+		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+		return
+	}
+	if req.ReportChapterTypeId <= 0 {
+		br.Msg = "章节ID有误"
+		return
+	}
+
+	item, e := models.GetReportChapterTypeById(req.ReportChapterTypeId)
+	if e != nil {
+		br.Msg = "操作失败"
+		br.ErrMsg = "获取报告章节失败, Err:" + e.Error()
+		return
+	}
+
+	item.SelectedImage = req.SelectedImage
+	item.UnselectedImage = req.UnselectedImage
+	item.PcSelectedImage = req.SelectedImage
+	item.PcUnselectedImage = req.UnselectedImage
+	item.EditImgUrl = req.EditImgUrl
+	item.YbIconUrl = req.UnselectedImage
+	item.YbBottomIcon = req.WordsImage
+	item.IsShow = req.IsShow
+	item.ReportChapterTypeThumb = req.EditImgUrl
+	item.BannerUrl = req.UnselectedImage
+
+	updateCols := []string{"SelectedImage", "UnselectedImage",
+		"PcSelectedImage", "PcUnselectedImage", "EditImgUrl", "YbIconUrl", "YbBottomIcon", "IsShow",
+		"ReportChapterTypeThumb", "BannerUrl",
+	}
+	if e = item.Update(updateCols); e != nil {
+		br.Msg = "操作失败"
+		br.ErrMsg = "更新报告章节失败, Err:" + e.Error()
+		return
+	}
+
+	// 清除小程序端的章节缓存
+	{
+		key := "hongze_yb:report_chapter_type:GetEffectTypeID"
+		_ = utils.Rc.Delete(key)
+	}
+	// 同步eta系统的章节小程序配置
+	go func() {
+		var reqEta services.EditReportChapterTypeSyncReq
+		reqEta.ReportChapterTypeId = req.ReportChapterTypeId
+		_, _ = services.EditReportChapterTypeSync(&reqEta)
+	}()
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "操作成功"
+}

controllers/roadshow/calendar.go

@@ -973,7 +973,7 @@ func (this *CalendarController) ResearcherList() {
 		return
 	}
 	researcherList, err := roadshow.GetResearcher()
-	groupMap := make(map[int][]*roadshow.Researcher)
+	groupMap := make(map[int][]*roadshow.ResearcherGroup)
 	for _, v := range researcherList {
 		//if v.RoleTypeCode == "ficc_admin" {
 		//	findItems := groupMap[1]

controllers/roadshow/report.go

@@ -85,7 +85,7 @@ func (this *CalendarController) ResearcherReportList() {
 		br.ErrMsg = "获取分组信息失败！,GetResearcherV2 Err:" + err.Error()
 		return
 	}
-	groupMap := make(map[int][]*roadshow.Researcher)
+	groupMap := make(map[int][]*roadshow.ResearcherGroup)
 	for _, v := range researcherList {
 		//if v.RoleTypeCode == "ficc_admin" {
 		//	findItems := groupMap[1]
@@ -1280,3 +1280,434 @@ func (this *CalendarController) OverseasCustomCalendarAdminList() {
 	br.Data = list
 	return
 }
+
+// OverseasSellerReportList
+// @Title 海外客户销售路演统计
+// @Description 海外客户销售路演统计接口
+// @Param   DataType   query   string  true       "枚举值：week、month、time_interval、online、offline"
+// @Param   DimensionType   query   string  true       "维度枚举值：company_status、roadshow_type"
+// @Param   StartDate   query   string  true       "开始日期,格式：2022-04-06"
+// @Param   EndDate   query   string  true       "结束日期,格式：2022-04-06"
+// @Success 200 {object} roadshow.RsReportRecordResp
+// @router /overseas_custom/seller/list [get]
+func (this *CalendarController) OverseasSellerReportList() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+	dataType := this.GetString("DataType")
+	dimensionType := this.GetString("DimensionType")
+	startDate := this.GetString("StartDate")
+	endDate := this.GetString("EndDate")
+
+	if dimensionType == "" {
+		dimensionType = "company_status"
+	}
+
+	var adminDataList []roadshowService.OverseasAdminDataMap
+	var err error
+
+	//获取列表
+	switch dataType {
+	case "week":
+		adminDataList, _, err = roadshowService.GetOverseasWeekDataV2("seller", dimensionType, 6)
+		if err != nil {
+			br.Msg = "数据异常"
+			br.ErrMsg = "数据异常，Err:" + err.Error()
+			return
+		}
+	case "month":
+		adminDataList, _, err = roadshowService.GetOverseasMonthDataV2("seller", dimensionType, 6)
+		if err != nil {
+			br.Msg = "数据异常"
+			br.ErrMsg = "数据异常，Err:" + err.Error()
+			return
+		}
+	case "time_interval":
+		if startDate == `` || endDate == `` {
+			br.Msg = "开始日期或结束日期不能为空"
+			br.ErrMsg = "开始日期或结束日期不能为空，Err:" + err.Error()
+			return
+		}
+		adminDataList, _, err = roadshowService.GetOverseasTimeIntervalData(startDate, endDate, "seller", dimensionType)
+		if err != nil {
+			br.Msg = "数据异常"
+			br.ErrMsg = "数据异常，Err:" + err.Error()
+			return
+		}
+
+	}
+
+	sellerList, err := roadshow.GetOverseaCustomCalendarSellerList()
+
+	adminReportRecordList := make([]roadshow.OverseasAdminReportRecord, 0)
+	rsAllReportRecordNumList := make([]roadshow.RsOverseasReportRecordNum, 0)
+	RsReportRecordResp := roadshow.RsOverseasReportRecordResp{
+		List:                  adminReportRecordList,
+		RsReportRecordNumList: rsAllReportRecordNumList,
+	}
+
+	startDateIndexList := make(map[int]string) //开始时间间隔map
+	endDateIndexList := make(map[int]string)   //结束时间间隔map
+
+	tmpAllTryOutNumMap := make(map[int]int)
+	tmpAllFormalNumMap := make(map[int]int)
+	tmpAllCloseNumMap := make(map[int]int)
+	tmpAllOnlineNumMap := make(map[int]int)
+	tmpAllOfflineNumMap := make(map[int]int)
+
+	for _, researcher := range sellerList {
+		//每个区间的数据
+		tmpAdminRsReportRecordNumList := make([]roadshow.RsOverseasReportRecordNum, 0)
+		for index, adminData := range adminDataList {
+			startDateIndexList[index] = adminData.StartDate
+			endDateIndexList[index] = adminData.EndDate
+
+			var tmpTryOutNum, tmpFormalNum, tmpCloseNum, tmpOnlineNum, tmpOfflineNum int
+			if num, ok := adminData.TryOutMap[researcher.AdminId]; ok {
+				tmpTryOutNum = num
+			}
+			if num, ok := adminData.FormalMap[researcher.AdminId]; ok {
+				tmpFormalNum = num
+			}
+			if num, ok := adminData.CloseMap[researcher.AdminId]; ok {
+				tmpCloseNum = num
+			}
+			if num, ok := adminData.OnlineMap[researcher.AdminId]; ok {
+				tmpOnlineNum = num
+			}
+			if num, ok := adminData.OfflineMap[researcher.AdminId]; ok {
+				tmpOfflineNum = num
+			}
+			tmpAdminRsReportRecordNum := roadshow.RsOverseasReportRecordNum{
+				TryOutNum:  tmpTryOutNum,
+				FormalNum:  tmpFormalNum,
+				CloseNum:   tmpCloseNum,
+				OnlineNum:  tmpOnlineNum,
+				OfflineNum: tmpOfflineNum,
+				StartDate:  adminData.StartDate,
+				EndDate:    adminData.EndDate,
+			}
+			tmpAdminRsReportRecordNumList = append(tmpAdminRsReportRecordNumList, tmpAdminRsReportRecordNum)
+
+			//总数据汇总
+			if _, ok := tmpAllTryOutNumMap[index]; !ok {
+				tmpAllTryOutNumMap[index] = 0
+			}
+			if _, ok := tmpAllFormalNumMap[index]; !ok {
+				tmpAllFormalNumMap[index] = 0
+			}
+			if _, ok := tmpAllCloseNumMap[index]; !ok {
+				tmpAllCloseNumMap[index] = 0
+			}
+			if _, ok := tmpAllOnlineNumMap[index]; !ok {
+				tmpAllOnlineNumMap[index] = 0
+			}
+			if _, ok := tmpAllOfflineNumMap[index]; !ok {
+				tmpAllOfflineNumMap[index] = 0
+			}
+			tmpAllTryOutNumMap[index] += tmpTryOutNum
+			tmpAllFormalNumMap[index] += tmpFormalNum
+			tmpAllCloseNumMap[index] += tmpCloseNum
+			tmpAllOnlineNumMap[index] += tmpOnlineNum
+			tmpAllOfflineNumMap[index] += tmpOfflineNum
+		}
+
+		// 数据都为0的时候不显示
+		adminTotalNum := 0
+		for _, v := range tmpAdminRsReportRecordNumList {
+			adminTotalNum += v.TryOutNum + v.CloseNum + v.FormalNum
+		}
+		if adminTotalNum > 0 {
+			tmpAdminReportRecord := roadshow.OverseasAdminReportRecord{
+				Name:                  researcher.RealName,
+				AdminId:               researcher.AdminId,
+				RsReportRecordNumList: tmpAdminRsReportRecordNumList,
+			}
+			RsReportRecordResp.List = append(RsReportRecordResp.List, tmpAdminReportRecord)
+		}
+	}
+
+	//总体汇总数据
+	for i := 0; i < len(tmpAllFormalNumMap); i++ {
+		tmpGroupRsReportRecordNum := roadshow.RsOverseasReportRecordNum{
+			TryOutNum:  tmpAllTryOutNumMap[i],
+			FormalNum:  tmpAllFormalNumMap[i],
+			CloseNum:   tmpAllCloseNumMap[i],
+			OnlineNum:  tmpAllOnlineNumMap[i],
+			OfflineNum: tmpAllOfflineNumMap[i],
+			StartDate:  startDateIndexList[i],
+			EndDate:    endDateIndexList[i],
+		}
+		rsAllReportRecordNumList = append(rsAllReportRecordNumList, tmpGroupRsReportRecordNum)
+	}
+	RsReportRecordResp.RsReportRecordNumList = rsAllReportRecordNumList
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+	br.Data = RsReportRecordResp
+	return
+}
+
+// OverseasResearcherReportList
+// @Title 研究员路演统计
+// @Description 研究员路演统计接口
+// @Param   DataType   query   string  true       "枚举值：week、month、time_interval"
+// @Param   StartDate   query   string  true       "开始日期,格式：2022-04-06"
+// @Param   EndDate   query   string  true       "结束日期,格式：2022-04-06"
+// @Success 200 {object} roadshow.RsReportRecordResp
+// @router /overseas_custom/researcher/list [get]
+func (this *CalendarController) OverseasResearcherReportList() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+	dataType := this.GetString("DataType")
+	startDate := this.GetString("StartDate")
+	endDate := this.GetString("EndDate")
+
+	var adminDataList []roadshowService.OverseasAdminDataMap
+	var err error
+	//var firstDate time.Time
+	//获取列表
+	switch dataType {
+	case "week":
+		adminDataList, _, err = roadshowService.GetOverseasWeekData("researcher", "company_status")
+		if err != nil {
+			br.Msg = "数据异常"
+			br.ErrMsg = "数据异常，Err:" + err.Error()
+			return
+		}
+	case "month":
+		adminDataList, _, err = roadshowService.GetOverseasMonthData("researcher", "company_status")
+		if err != nil {
+			br.Msg = "数据异常"
+			br.ErrMsg = "数据异常，Err:" + err.Error()
+			return
+		}
+	case "time_interval":
+		if startDate == `` || endDate == `` {
+			br.Msg = "开始日期或结束日期不能为空"
+			br.ErrMsg = "开始日期或结束日期不能为空，Err:" + err.Error()
+			return
+		}
+		adminDataList, _, err = roadshowService.GetOverseasTimeIntervalData(startDate, endDate, "researcher", "company_status")
+		if err != nil {
+			br.Msg = "数据异常"
+			br.ErrMsg = "数据异常，Err:" + err.Error()
+			return
+		}
+
+	}
+
+	researcherList, err := roadshow.GetOverseaCustomCalendarResearcherList()
+	if err != nil {
+		br.Msg = "获取信息失败！"
+		br.ErrMsg = "获取分组信息失败！,GetResearcherV2 Err:" + err.Error()
+		return
+	}
+
+	adminReportRecordList := make([]roadshow.OverseasAdminReportRecord, 0)
+	rsAllReportRecordNumList := make([]roadshow.RsOverseasReportRecordNum, 0)
+	RsReportRecordResp := roadshow.RsOverseasReportRecordResp{
+		List:                  adminReportRecordList,
+		RsReportRecordNumList: rsAllReportRecordNumList,
+	}
+
+	startDateIndexList := make(map[int]string) //开始时间间隔map
+	endDateIndexList := make(map[int]string)   //结束时间间隔map
+
+	tmpAllTryOutNumMap := make(map[int]int)
+	tmpAllFormalNumMap := make(map[int]int)
+	tmpAllMeetingNumMap := make(map[int]int)
+
+	for _, researcher := range researcherList {
+		//组内研究员数据
+
+		//每个区间的数据
+		tmpAdminRsReportRecordNumList := make([]roadshow.RsOverseasReportRecordNum, 0)
+		for index, adminData := range adminDataList {
+			startDateIndexList[index] = adminData.StartDate
+			endDateIndexList[index] = adminData.EndDate
+
+			var tmpTryOutNum, tmpFormalNum, tmpCloseNum int
+			if num, ok := adminData.TryOutMap[researcher.AdminId]; ok {
+				tmpTryOutNum = num
+			}
+			if num, ok := adminData.FormalMap[researcher.AdminId]; ok {
+				tmpFormalNum = num
+			}
+			if num, ok := adminData.CloseMap[researcher.AdminId]; ok {
+				tmpCloseNum = num
+			}
+			tmpAdminRsReportRecordNum := roadshow.RsOverseasReportRecordNum{
+				TryOutNum: tmpTryOutNum,
+				FormalNum: tmpFormalNum,
+				CloseNum:  tmpCloseNum,
+				StartDate: adminData.StartDate,
+				EndDate:   adminData.EndDate,
+			}
+			tmpAdminRsReportRecordNumList = append(tmpAdminRsReportRecordNumList, tmpAdminRsReportRecordNum)
+
+			//总数据汇总
+			if _, ok := tmpAllTryOutNumMap[index]; !ok {
+				tmpAllTryOutNumMap[index] = 0
+			}
+			if _, ok := tmpAllFormalNumMap[index]; !ok {
+				tmpAllFormalNumMap[index] = 0
+			}
+			if _, ok := tmpAllMeetingNumMap[index]; !ok {
+				tmpAllMeetingNumMap[index] = 0
+			}
+			tmpAllTryOutNumMap[index] += tmpTryOutNum
+			tmpAllFormalNumMap[index] += tmpFormalNum
+			tmpAllMeetingNumMap[index] += tmpCloseNum
+		}
+		// 数据都为0的时候不显示
+		adminTotalNum := 0
+		for _, v := range tmpAdminRsReportRecordNumList {
+			adminTotalNum += v.TryOutNum + v.CloseNum + v.FormalNum
+		}
+		if adminTotalNum > 0 {
+			tmpAdminReportRecord := roadshow.OverseasAdminReportRecord{
+				Name:                  researcher.RealName,
+				AdminId:               researcher.AdminId,
+				RsReportRecordNumList: tmpAdminRsReportRecordNumList,
+			}
+			RsReportRecordResp.List = append(RsReportRecordResp.List, tmpAdminReportRecord)
+		}
+	}
+
+	//总体汇总数据
+	for i := 0; i < len(tmpAllFormalNumMap); i++ {
+		tmpGroupRsReportRecordNum := roadshow.RsOverseasReportRecordNum{
+			TryOutNum: tmpAllTryOutNumMap[i],
+			FormalNum: tmpAllFormalNumMap[i],
+			CloseNum:  tmpAllMeetingNumMap[i],
+			StartDate: startDateIndexList[i],
+			EndDate:   endDateIndexList[i],
+		}
+		rsAllReportRecordNumList = append(rsAllReportRecordNumList, tmpGroupRsReportRecordNum)
+	}
+	RsReportRecordResp.RsReportRecordNumList = rsAllReportRecordNumList
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+	br.Data = RsReportRecordResp
+	return
+}
+
+// OverseasCalendarList
+// @Title 海外客户路演详情列表
+// @Description 海外客户路演详情列表接口
+// @Param   AdminType   query   string  true       "枚举值：researcher、seller、 special：专项路演"
+// @Param   DataType   query   string  true       "枚举值：try_out、formal、close、online、offline"
+// @Param   AdminIds   query   string  true       "用户ids"
+// @Param   StartDate   query   string  true       "开始日期,格式：2022-04-06"
+// @Param   EndDate   query   string  true       "结束日期,格式：2022-04-06"
+// @Success 200 {object} []roadshow.RsReportRecordList
+// @router /overseas/calendar/list [get]
+func (this *CalendarController) OverseasCalendarList() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+	adminType := this.GetString("AdminType")
+	dataType := this.GetString("DataType")
+	startDate := this.GetString("StartDate")
+	endDate := this.GetString("EndDate")
+	adminIds := this.GetString("AdminIds")
+	if adminIds == "" {
+		br.Msg = "请传入对应的人员"
+		return
+	}
+
+	//adminIdsArr := make([]int, 0)
+	//adminIdSlice := strings.Split(adminIds, ",")
+	//for _, v := range adminIdSlice {
+	//	id,_ := strconv.Atoi(v)
+	//	adminIdsArr = append(adminIdsArr, id)
+	//}
+
+	//正式客户
+	//var condition string
+	//var pars []interface{}
+	//condition = ` and a.start_date >= ? and a.end_date <= ? `
+	//pars = append(pars, startDate, endDate)
+
+	var sellerIds, researcherIds string
+	//选择的人员类型（发起人还是被发起人）
+	if adminType == "seller" {
+		//condition += ` and a.seller_id IN (` + utils.GetOrmInReplace(len(adminIdsArr)) + `)`
+		sellerIds = adminIds
+	} else {
+		//condition += ` and a.researcher_id IN (` + utils.GetOrmInReplace(len(adminIdsArr)) + `)`
+		researcherIds = adminIds
+	}
+	//pars = append(pars, adminIdsArr)
+
+	var status string
+	//获取列表
+	switch dataType {
+	case "try_out":
+		//condition += ` and a.company_status = ? )`
+		//pars = append(pars, "试用")
+		status = "试用"
+	case "formal":
+		//condition += ` and a.company_status = ? )`
+		//pars = append(pars, "正式")
+		status = "正式"
+	case "close":
+		//condition += ` and a.company_status = ? )`
+		//pars = append(pars, "关闭")
+		status = "关闭"
+	//case "online":
+	//	condition += ` and a.roadshow_type = ? `
+	//	pars = append(pars, "线上")
+	//case "offline":
+	//	condition += ` and a.roadshow_type = ? `
+	//	pars = append(pars, "线下")
+	default:
+		br.Msg = "请传入类型"
+		br.ErrMsg = "请传入类型DataType"
+		return
+	}
+
+	list, err := roadshow.GetOverseaCustomCalendarList2(sellerIds, researcherIds, startDate, endDate, status)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败,ERR:" + err.Error()
+		return
+	}
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+	br.Data = list
+	return
+}

controllers/user_login.go

@@ -143,7 +143,7 @@ func (this *UserLoginController) GetVerifyCode() {
 			br.Msg = "请输入手机号"
 			return
 		}
-		if req.TelAreaCode == "86" && !utils.ValidateMobileFormatat(req.Mobile) {
+		if req.TelAreaCode == utils.TelAreaCodeHome && !utils.ValidateMobileFormatat(req.Mobile) {
 			br.Msg = "您的手机号输入有误, 请检查"
 			return
 		}
@@ -250,12 +250,13 @@ func (this *UserLoginController) Login() {
 
 	// 入参
 	type UserLoginReq struct {
-		LoginType  int    `description:"登录方式: 1-账号; 2-手机号; 3-邮箱"`
-		Username   string `description:"账号"`
-		Password   string `description:"密码"`
-		Mobile     string `description:"手机号"`
-		Email      string `description:"邮箱"`
-		VerifyCode string `description:"验证码"`
+		LoginType   int    `description:"登录方式: 1-账号; 2-手机号; 3-邮箱"`
+		Username    string `description:"账号"`
+		Password    string `description:"密码"`
+		Mobile      string `description:"手机号"`
+		Email       string `description:"邮箱"`
+		VerifyCode  string `description:"验证码"`
+		TelAreaCode string `description:"区号"`
 	}
 	var req UserLoginReq
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
@@ -266,19 +267,7 @@ func (this *UserLoginController) Login() {
 	}
 	req.Username = strings.TrimSpace(req.Username)
 	req.Mobile = strings.TrimSpace(req.Mobile)
-	if req.Mobile != "" {
-		if !utils.ValidateMobileFormatat(req.Mobile) {
-			br.Msg = "您的手机号输入有误, 请检查"
-			return
-		}
-	}
 	req.Email = strings.TrimSpace(req.Email)
-	if req.Email != "" {
-		if !utils.ValidateEmailFormatat(req.Email) {
-			br.Msg = "您的邮箱输入有误, 请检查"
-			return
-		}
-	}
 	req.VerifyCode = strings.TrimSpace(req.VerifyCode)
 	if req.LoginType != 1 && req.LoginType != 2 && req.LoginType != 3 {
 		br.Msg = "登录方式有误"
@@ -367,7 +356,7 @@ func (this *UserLoginController) Login() {
 			br.Msg = "请输入手机号"
 			return
 		}
-		if !utils.ValidateMobileFormatat(req.Mobile) {
+		if req.TelAreaCode == utils.TelAreaCodeHome && !utils.ValidateMobileFormatat(req.Mobile) {
 			br.Msg = "您的手机号输入有误, 请检查"
 			return
 		}
@@ -466,7 +455,7 @@ func (this *UserLoginController) Login() {
 	account := utils.MD5(sysUser.AdminName)
 	token := utils.GenToken(account)
 	sysSession := new(system.SysSession)
-	sysSession.UserName = req.Username
+	sysSession.UserName = sysUser.AdminName
 	sysSession.SysUserId = sysUser.AdminId
 	sysSession.ExpiredTime = time.Now().AddDate(0, 0, 90)
 	sysSession.IsRemember = 0 // 均需要做过期校验
@@ -647,11 +636,12 @@ func (this *UserLoginController) ForgetCodeVerify() {
 	}()
 
 	type ForgetCodeVerifyReq struct {
-		FindType   int    `description:"密码找回方式: 1-手机号; 2-邮箱"`
-		VerifyCode string `description:"验证码"`
-		UserName   string `description:"用户名"`
-		Mobile     string `description:"手机号"`
-		Email      string `description:"邮箱"`
+		FindType    int    `description:"密码找回方式: 1-手机号; 2-邮箱"`
+		VerifyCode  string `description:"验证码"`
+		UserName    string `description:"用户名"`
+		Mobile      string `description:"手机号"`
+		Email       string `description:"邮箱"`
+		TelAreaCode string `description:"区号"`
 	}
 	var req ForgetCodeVerifyReq
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
@@ -678,7 +668,7 @@ func (this *UserLoginController) ForgetCodeVerify() {
 			br.Msg = "请输入手机号"
 			return
 		}
-		if !utils.ValidateMobileFormatat(req.Mobile) {
+		if req.TelAreaCode == utils.TelAreaCodeHome && !utils.ValidateMobileFormatat(req.Mobile) {
 			br.Msg = "您的手机号输入有误, 请检查"
 			return
 		}

go.mod

@@ -14,8 +14,8 @@ require (
 	github.com/alibabacloud-go/tea-utils/v2 v2.0.1
 	github.com/aliyun/alibaba-cloud-sdk-go v1.61.1656
 	github.com/aliyun/aliyun-oss-go-sdk v2.2.0+incompatible
-	github.com/beego/bee/v2 v2.0.4
-	github.com/beego/beego/v2 v2.0.7
+	github.com/beego/bee/v2 v2.1.0
+	github.com/beego/beego/v2 v2.1.0
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/go-sql-driver/mysql v1.7.0
 	github.com/go-xorm/xorm v0.7.9
@@ -64,7 +64,7 @@ require (
 	github.com/garyburd/redigo v1.6.3 // indirect
 	github.com/go-redis/redis/v8 v8.11.6-0.20220405070650-99c79f7041fc // indirect
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/gonum/blas v0.0.0-20181208220705-f22b278b28ac // indirect
 	github.com/gonum/floats v0.0.0-20181209220543-c233463c7e82 // indirect
 	github.com/gonum/integrate v0.0.0-20181209220457-a422b5c0fdf2 // indirect
@@ -83,9 +83,9 @@ require (
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/prometheus/client_golang v1.14.0 // indirect
+	github.com/prometheus/client_golang v1.15.1 // indirect
 	github.com/prometheus/client_model v0.3.0 // indirect
-	github.com/prometheus/common v0.39.0 // indirect
+	github.com/prometheus/common v0.42.0 // indirect
 	github.com/prometheus/procfs v0.9.0 // indirect
 	github.com/richardlehane/mscfb v1.0.4 // indirect
 	github.com/richardlehane/msoleps v1.0.3 // indirect
@@ -93,7 +93,6 @@ require (
 	github.com/shiena/ansicolor v0.0.0-20200904210342-c7312218db18 // indirect
 	github.com/sirupsen/logrus v1.9.0 // indirect
 	github.com/spf13/cast v1.5.0 // indirect
-	github.com/stretchr/testify v1.8.1 // indirect
 	github.com/tidwall/gjson v1.14.1 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.0 // indirect
@@ -107,10 +106,9 @@ require (
 	golang.org/x/sys v0.7.0 // indirect
 	golang.org/x/text v0.9.0 // indirect
 	golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
-	google.golang.org/protobuf v1.28.1 // indirect
+	google.golang.org/protobuf v1.30.0 // indirect
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	xorm.io/builder v0.3.6 // indirect
 	xorm.io/core v0.7.2-0.20190928055935-90aeac8d08eb // indirect

go.sum

@@ -82,10 +82,10 @@ github.com/astaxie/beego v1.12.3/go.mod h1:p3qIm0Ryx7zeBHLljmd7omloyca1s4yu1a8kM
 github.com/aws/aws-sdk-go v1.42.23/go.mod h1:gyRszuZ/icHmHAVE4gc/r+cfCmhA1AD+vqfWbgI+eHs=
 github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f h1:ZNv7On9kyUzm7fvRZumSyy/IUiSC7AzL0I1jKKtwooA=
 github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod h1:AuiFmCCPBSrqvVMvuqFuk0qogytodnVFVSN5CeJB8Gc=
-github.com/beego/bee/v2 v2.0.4 h1:nEjPwxJ8D+cr54eWChJGoGRH7bJ7OQwbhx8rU0OQf7E=
-github.com/beego/bee/v2 v2.0.4/go.mod h1:wq0YrEmPcdNfDNpaUgiTkaW9zso7M8n0HCCShEBOzM0=
-github.com/beego/beego/v2 v2.0.7 h1:9KNnUM40tn3pbCOFfe6SJ1oOL0oTi/oBS/C/wCEdAXA=
-github.com/beego/beego/v2 v2.0.7/go.mod h1:f0uOEkmJWgAuDTlTxUdgJzwG3PDSIf3UWF3NpMohbFE=
+github.com/beego/bee/v2 v2.1.0 h1:4WngbAnkvVOyKy74WXcRH3clon76wkjhuzrV2mx2fQU=
+github.com/beego/bee/v2 v2.1.0/go.mod h1:wDhKy5TNxv46LHKsK2gyxo38ObCOm9PbCN89lWHK3EU=
+github.com/beego/beego/v2 v2.1.0 h1:Lk0FtQGvDQCx5V5yEu4XwDsIgt+QOlNjt5emUa3/ZmA=
+github.com/beego/beego/v2 v2.1.0/go.mod h1:6h36ISpaxNrrpJ27siTpXBG8d/Icjzsc7pU1bWpp0EE=
 github.com/beego/goyaml2 v0.0.0-20130207012346-5545475820dd/go.mod h1:1b+Y/CofkYwXMUU0OhQqGvsY2Bvgr4j6jfT699wyZKQ=
 github.com/beego/x2j v0.0.0-20131220205130-a0352aadc542/go.mod h1:kSeGC/p1AbBiEp5kat81+DSQrZenVBZXklMLaELspWU=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
@@ -188,8 +188,9 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
+github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/snappy v0.0.0-20170215233205-553a64147049/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
@@ -259,7 +260,7 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
@@ -331,8 +332,8 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP
 github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
 github.com/prometheus/client_golang v1.7.0/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
-github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw=
-github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y=
+github.com/prometheus/client_golang v1.15.1 h1:8tXpTmJbyH5lydzFPoxSIJ0J46jdh3tylbvM1xCv0LI=
+github.com/prometheus/client_golang v1.15.1/go.mod h1:e9yaBhRPU2pPNsZwE+JdQl0KEt1N9XgF6zxWmaC0xOk=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
@@ -343,8 +344,8 @@ github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3d
 github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
-github.com/prometheus/common v0.39.0 h1:oOyhkDq05hPZKItWVBkJ6g6AtGxi+fy7F4JvUV8uhsI=
-github.com/prometheus/common v0.39.0/go.mod h1:6XBZ7lYdLCbkAVhwRsWTZn+IN5AB9F/NXd5w0BbEX0Y=
+github.com/prometheus/common v0.42.0 h1:EKsfXEYo4JpWMHH5cg+KOUWeuJSov1Id8zGR8eeI1YM=
+github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
@@ -359,7 +360,7 @@ github.com/richardlehane/mscfb v1.0.4/go.mod h1:YzVpcZg9czvAuhk9T+a3avCpcFPMUWm7
 github.com/richardlehane/msoleps v1.0.1/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg=
 github.com/richardlehane/msoleps v1.0.3 h1:aznSZzrwYRl3rLKRT3gUk9am7T/mLNSnJINvN0AQoVM=
 github.com/richardlehane/msoleps v1.0.3/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg=
-github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8=
+github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
 github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/shiena/ansicolor v0.0.0-20151119151921-a422bbe96644/go.mod h1:nkxAfR/5quYxwPZhyDxgasBMnRtBZd0FCEpawpjMUFg=
@@ -595,8 +596,8 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
-google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
+google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk=
 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk=

models/advisory/chart_permission.go

@@ -1,7 +1,6 @@
 package advisory
 
 import (
-	"fmt"
 	"github.com/beego/beego/v2/client/orm"
 )
 
@@ -18,7 +17,7 @@ type ChartPermissionResp struct {
 	List []*ChartPermission
 }
 
-//用户关注的分类
+// 用户关注的分类
 type ChartPermissionListResp struct {
 	ChartPermissionId   int    `description:"权限id"`
 	ChartPermissionName string `description:"名称"`
@@ -32,7 +31,7 @@ type GetChartPermissionAllByChartIdResp struct {
 	ChartPermissionId int `description:"权限id"`
 }
 
-//用户关注的分类
+// 用户关注的分类
 type MyChartPermission struct {
 	ChartPermissionId   int    `description:"权限id"`
 	ClassifyName        string `description:"分类名称"`
@@ -59,30 +58,6 @@ type NoAdminInfoResp struct {
 	List []*MyChartPermission
 }
 
-//获取一级分类名称
-func AdvisoryGetFirstChartPermissionAll() (items []*ChartPermission, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT  * FROM chart_permission as ch  WHERE product_id = 1  AND product_name = 'ficc'  GROUP BY ch.classify_name ORDER BY sort ASC; `
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
-}
-
-//获取关注分类名称
-func GetChartPermissionByIds(Ids string) (items []*MyChartPermission, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT * FROM chart_permission WHERE chart_permission_id IN (` + Ids + `)`
-	fmt.Println(sql)
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
-}
-
-func AdvisoryGetChartToClassifyName(ClassifyName string) (items []*ChartPermission, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT * FROM chart_permission  WHERE product_id = 1  AND product_name = 'ficc' AND classify_name = ?  ORDER BY sort ASC `
-	_, err = o.Raw(sql, ClassifyName).QueryRows(&items)
-	return
-}
-
 func GetCategoryInfoById(chartPermissionId int) (item *ChartPermission, err error) {
 	o := orm.NewOrm()
 	//o.Using("rddp")
@@ -91,10 +66,10 @@ func GetCategoryInfoById(chartPermissionId int) (item *ChartPermission, err erro
 	return
 }
 
-//获取分类列表
+// 获取分类列表
 func GetChartPermissionList() (items []*MyChartPermission, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT  * FROM chart_permission as ch  WHERE product_id = 1  AND product_name = 'ficc'   ORDER BY sort ASC; `
+	sql := `SELECT  * FROM chart_permission as ch  WHERE product_id = 1  AND product_name = 'ficc' and parent_id > 0  ORDER BY sort ASC; `
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
@@ -109,7 +84,7 @@ type GetBuChartPermissionRespLIst struct {
 	List []*GetBuChartPermissionResp
 }
 
-//获取用户购买的分类信息
+// 获取用户购买的分类信息
 func GetBuChartPermission(CompanyId int, pars []interface{}) (items []*GetBuChartPermissionResp, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT ch.chart_permission_id , ch.permission_name ,ch.image_url  FROM chart_permission  as ch INNER JOIN company_report_permission as co ON co.chart_permission_id = ch.chart_permission_id WHERE co.company_id = ? `
@@ -117,7 +92,7 @@ func GetBuChartPermission(CompanyId int, pars []interface{}) (items []*GetBuChar
 	return
 }
 
-//获取分类列表
+// 获取分类列表
 func GetPermissionList(condition string, pars []interface{}, startSize, pageSize int) (items []*ChartPermission, err error) {
 	sql := ` SELECT * FROM chart_permission WHERE 1=1 `
 	if condition != "" {
@@ -129,7 +104,7 @@ func GetPermissionList(condition string, pars []interface{}, startSize, pageSize
 	return
 }
 
-//获取用户权限的一级分类名称
+// 获取用户权限的一级分类名称
 func GetFirstChartPermissionAllByUser(Ids string) (items []*ChartPermission, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT  * FROM chart_permission as ch  WHERE product_id = 1  AND product_name = 'ficc' AND chart_permission_id IN (` + Ids + `)` + ` GROUP BY ch.classify_name ORDER BY sort ASC; `
@@ -137,7 +112,7 @@ func GetFirstChartPermissionAllByUser(Ids string) (items []*ChartPermission, err
 	return
 }
 
-//获取用户权限的二级分类名称
+// 获取用户权限的二级分类名称
 func GetChartToClassifyNameByUser(ClassifyName, Ids string) (items []*ChartPermission, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT * FROM chart_permission  WHERE product_id = 1  AND product_name = 'ficc' AND classify_name = ?   AND chart_permission_id IN (` + Ids + `)`

models/chart_permission.go

@@ -27,6 +27,8 @@ type ChartPermission struct {
 	CygxAuth            int       `description:"是否是权限，用于查研观向小程序前台权限校验"`
 	YbImgUrl            string    `description:"研报小程序报告列表icon"`
 	PriceDrivenState    int       `description:"品种价格驱动开启状态 0-关闭 1-开启"`
+	ParentId            int       `description:"父级权限id"`
+	IsPublic            int       `description:"是否是公有权限1:公有权限，0私有权限"`
 }
 
 // GetChartPermissionById 主键获取权限
@@ -70,26 +72,42 @@ func GetFiccPermissionExceptTactic() (items []*ChartPermission, err error) {
 	return
 }
 
-// GetPermissionByProductIdAndClassifyName 获取子分类
-func GetPermissionByProductIdAndClassifyName(productId int, classifyName string) (items []*ChartPermission, err error) {
+// GetFiccPermissionSecondPublic 获取ficc公有的二级品种
+func GetFiccPermissionSecondPublic() (items []*ChartPermission, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT * FROM chart_permission WHERE enabled = 1 AND product_id = ? AND classify_name = ? AND permission_type = 0 ORDER BY sort ASC`
-	_, err = o.Raw(sql, productId, classifyName).QueryRows(&items)
+	sql := `SELECT * FROM chart_permission WHERE enabled = 1 AND permission_type = 0 AND product_id = 1 and parent_id>0 and is_public=1 ORDER BY sort ASC`
+	_, err = o.Raw(sql).QueryRows(&items)
+	return
+}
+
+// GetPermissionFirstByProductId 获取一级品种
+func GetPermissionFirstByProductId(productId int) (items []*ChartPermission, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM chart_permission WHERE enabled = 1 AND product_id = ? and parent_id=0  ORDER BY sort ASC`
+	_, err = o.Raw(sql, productId).QueryRows(&items)
 	return
 }
 
-// GetYbChartPermissionFirstByName 根据分类名称获取一级分类
-func GetYbChartPermissionFirstByName(classifyName string) (item *YbChartPermissionFirst, err error) {
+// GetPermissionFirst 获取一级品种
+func GetPermissionFirst() (items []*ChartPermission, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT * FROM chart_permission_first WHERE classify_name = ? LIMIT 1`
-	err = o.Raw(sql, classifyName).QueryRow(&item)
+	sql := `SELECT * FROM chart_permission WHERE enabled = 1 and parent_id=0  ORDER BY sort ASC`
+	_, err = o.Raw(sql).QueryRows(&items)
+	return
+}
+
+// GetPermissionByProductIdAndClassifyName 获取子分类
+func GetPermissionByProductIdAndClassifyName(productId int, classifyName string) (items []*ChartPermission, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM chart_permission WHERE parent_id > 0 and enabled = 1 AND product_id = ? AND classify_name = ? AND permission_type = 0 ORDER BY sort ASC`
+	_, err = o.Raw(sql, productId, classifyName).QueryRows(&items)
 	return
 }
 
 // GetChartPermissionById 主键获取权限
 func GetChartPermissionByRemark(remark string) (item *ChartPermission, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT * FROM chart_permission WHERE remark = ? LIMIT 1`
+	sql := `SELECT * FROM chart_permission WHERE parent_id > 0 and remark = ?  LIMIT 1`
 	err = o.Raw(sql, remark).QueryRow(&item)
 	return
 }
@@ -99,7 +117,7 @@ func GetChartPermissionByIds(permissionIds []string) (list []*ChartPermission, e
 	qb, _ := orm.NewQueryBuilder("mysql")
 	// 构建查询对象
 	qb.Select("*").From("chart_permission").
-		Where("chart_permission_id").In(permissionIds...)
+		Where("parent_id > 0 and chart_permission_id").In(permissionIds...)
 	// 导出 SQL 语句
 	sql := qb.String()
 
@@ -117,7 +135,7 @@ func GetChartPermissionByIdList(chartPermissionIdList []int) (list []*ChartPermi
 	}
 
 	o := orm.NewOrm()
-	sql := `select * from chart_permission where chart_permission_id in (` + utils.GetOrmInReplace(num) + `)`
+	sql := `select * from chart_permission where parent_id > 0 and chart_permission_id in (` + utils.GetOrmInReplace(num) + `)`
 	_, err = o.Raw(sql, chartPermissionIdList).QueryRows(&list)
 
 	return
@@ -128,7 +146,7 @@ func GetChartPermissionByNames(permissionNames []string) (list []*ChartPermissio
 	qb, _ := orm.NewQueryBuilder("mysql")
 	// 构建查询对象
 	qb.Select("*").From("chart_permission").
-		Where("chart_permission_name").In(permissionNames...)
+		Where("parent_id > 0 and chart_permission_name").In(permissionNames...)
 	// 导出 SQL 语句
 	sql := qb.String()
 
@@ -141,14 +159,14 @@ func GetChartPermissionByNames(permissionNames []string) (list []*ChartPermissio
 // GetChartPermissionList 获取品种权限列表
 func GetChartPermissionList() (list []*ChartPermission, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT * FROM chart_permission ORDER BY product_id ASC, sort ASC`
+	sql := `SELECT * FROM chart_permission WHERE parent_id > 0 ORDER BY product_id ASC, sort ASC`
 	_, err = o.Raw(sql).QueryRows(&list)
 	return
 }
 
 func GetChartPermissionListRai() (items []*ChartPermission, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT * FROM chart_permission WHERE product_id=2  ORDER BY sort ASC `
+	sql := `SELECT * FROM chart_permission WHERE product_id=2 and parent_id > 0  ORDER BY sort ASC `
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
@@ -156,7 +174,7 @@ func GetChartPermissionListRai() (items []*ChartPermission, err error) {
 // 获取权益主观权限
 func GetChartPermissionListRaiSubjectivity() (items []*ChartPermission, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT * FROM chart_permission WHERE product_id=2  AND permission_type = 1  ORDER BY sort ASC `
+	sql := `SELECT * FROM chart_permission WHERE product_id=2  AND permission_type = 1 and parent_id > 0  ORDER BY sort ASC `
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }

models/classify.go

@@ -2,7 +2,6 @@ package models
 
 import (
 	"github.com/beego/beego/v2/client/orm"
-	"github.com/rdlucklib/rdluck_tools/paging"
 	"hongze/hz_crm_api/utils"
 	"time"
 )
@@ -39,6 +38,7 @@ type Classify struct {
 	RelateTel         int       `description:"是否在电话会中可选: 0-否; 1-是"`
 	RelateVideo       int       `description:"是否在路演视频中可选: 0-否; 1-是"`
 	IsMassSend        int       `description:"1:群发,0:非群发"`
+	Enabled           int       `description:"是否可用，1可用，0禁用"`
 }
 
 func GetClassifyById(classifyId int) (item *Classify, err error) {
@@ -71,6 +71,7 @@ type ClassifyList struct {
 	YbRightBanner     string    `description:"Pc端详情页，右侧，报告合集背景图"`
 	RelateTel         int       `description:"是否在电话会中可选: 0-否; 1-是"`
 	RelateVideo       int       `description:"是否在路演视频中可选: 0-否; 1-是"`
+	Enabled           int       `description:"是否可用，1可用，0禁用"`
 	Child             []*ClassifyItem
 	ClassifyMenuList  []*ClassifyMenu
 }
@@ -82,8 +83,7 @@ type ClassifyItem struct {
 }
 
 type ClassifyListResp struct {
-	List   []*ClassifyList
-	Paging *paging.PagingItem `description:"分页数据"`
+	List []*ClassifyList
 }
 
 // 获取分类列表

models/company/company.go

@@ -27,14 +27,11 @@ type Company struct {
 	LastUpdatedTime time.Time `description:"最后一次阅读时间"`
 	Seller          string    `description:"销售员"`
 	SellsId         int       `description:"销售员id"`
-	ShareSeller     string    `description:"共享销售员"`
-	ShareSellerId   int       `description:"共享销售员id"`
 	CompanyBelong   string    `description:"客户所属，ficc：ficc客户，public_offering：公募客户，partner：合作伙伴"`
 	StartDate       string    `description:"合同开始日期"`
 	EndDate         string    `description:"合同结束日期"`
 	LastType        int       `description:"原客户标签"`
 	IsVip           int       `description:"0:普通用户,1:大客户"`
-	IsShare         int       `description:"0:非共享用户,1:共享客户"`
 	FirstStartDate  string    `description:"首次设置为试用客户开始时间"`
 	FirstEndDate    string    `description:"首次设置为试用客户结束时间"`
 	DateType        int       `description:"设置流失类型，1：1个月，2：2个月，3：3个月"`
@@ -93,6 +90,7 @@ type CompanySearchItem struct {
 	RegionType      string `description:"地区类型，国内，国外"`
 	ShareSeller     string `description:"共享销售员"`
 	ShareSellerId   int    `description:"共享销售员id"`
+	ShareSellerIds  string `description:"共享销售员id"`
 	IsShare         int    `description:"0:非共享用户,1:共享客户"`
 	IsScrounge      int    `description:"是否白嫖 0不是 1是"`
 	Nation          string `description:"所属国家"`
@@ -105,7 +103,7 @@ type CompanySearchListResp struct {
 
 func GetCompanySearchList(condition string, pars []interface{}, limitParam ...int) (items []*CompanySearchItem, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT DISTINCT a.company_id,a.company_name,a.credit_code,a.company_code,a.region_type,a.share_seller_id,a.share_seller,a.is_share,
+	sql := `SELECT DISTINCT a.company_id,a.company_name,a.credit_code,a.company_code,a.region_type,b.share_seller_id,b.share_seller,b.is_share,
             GROUP_CONCAT(b.status ORDER BY b.product_id ASC SEPARATOR '/') AS status,
 			GROUP_CONCAT(DISTINCT b.seller_name ORDER BY b.product_id ASC SEPARATOR '/' ) AS seller_name,
 			GROUP_CONCAT(DISTINCT b.seller_id ORDER BY b.product_id ASC SEPARATOR '/') AS seller_ids,
@@ -117,7 +115,8 @@ func GetCompanySearchList(condition string, pars []interface{}, limitParam ...in
 			GROUP_CONCAT(DISTINCT b.product_name ORDER BY b.product_id ASC SEPARATOR '/') AS company_type,
             GROUP_CONCAT(DISTINCT b.approve_status ORDER BY b.product_id ASC SEPARATOR '/') AS approve_status,
             GROUP_CONCAT(DISTINCT b.freeze_start_date ORDER BY b.product_id ASC SEPARATOR '/') AS freeze_start_date,
-            GROUP_CONCAT(DISTINCT b.freeze_end_date ORDER BY b.product_id ASC SEPARATOR '/') AS freeze_end_date
+            GROUP_CONCAT(DISTINCT b.freeze_end_date ORDER BY b.product_id ASC SEPARATOR '/') AS freeze_end_date,
+			GROUP_CONCAT(DISTINCT b.share_seller_id ORDER BY b.product_id ASC SEPARATOR ',') AS share_seller_ids
 			FROM company AS a
 			INNER JOIN company_product AS b ON a.company_id=b.company_id
 			WHERE a.enabled=1 `
@@ -157,6 +156,7 @@ type CompanyItem struct {
 	FreezeReason     string `description:"冻结理由"`
 	LossTime         string `description:"流失时间"`
 	Status           string `description:"客户状态：'试用','永续','冻结','流失','正式' "`
+	StatusStr        string `description:"客户状态：'试用','永续','冻结','流失','正式' 如果是共享客户会加上 '(共享)'" `
 	CompanyType      string `description:"客户类型：ficc/权益"`
 	ApproveStatus    string `description:"审批状态：'待审批','已审批','驳回' 审批状态为空时，表示没有审批申请"`
 	SellerName       string `description:"销售：吉根龙/颖丹"`
@@ -164,6 +164,7 @@ type CompanyItem struct {
 	SellerIds        string `description:"销售ID集合，包含ficc和权益的销售id"`
 	ShareSeller      string `description:"共享销售员"`
 	ShareSellerId    int    `description:"共享销售员id"`
+	ShareSellerIds   string `description:"共享销售员ids"`
 	PackageTypes     string `description:"套餐类型集合，包含ficc和权益的套餐类型" json:"-"`
 	FiccPackageType  int    `description:"ficc的套餐类型"`
 	ExpireDay        string `description:"到期天数"`
@@ -212,6 +213,8 @@ type CompanyItem struct {
 	CloseReason      string               `description:"关闭原因"`
 	CloseTime        string               `description:"关闭时间"`
 	Nation           string               `description:"所属国家"`
+	LatestServiceRecord time.Time            `description:"最近沟通时间"`
+	FirstDate           time.Time            `description:"首次服务时间"`
 }
 
 type CompanyListItem struct {
@@ -272,6 +275,7 @@ type CompanyListItem struct {
 	IsShare          int                  `description:"0:非共享用户,1:共享客户"`
 	ShareSeller      string               `description:"共享销售员"`
 	ShareSellerId    int                  `description:"共享销售员id"`
+	ShareSellerIds   string               `description:"共享销售员ids"`
 	LastServiceTime  string               `description:"最后服务时间"`
 	ServiceTimes     int                  `description:"服务次数"`
 	CloseReason      string               `description:"关闭客户原因"`
@@ -316,7 +320,7 @@ func GetCompanyList(condition, status, sortStr string, pars []interface{}, start
 	// 权益客户: 以权益最后一次阅读时间作为参考
 	t := time.Now().Local().AddDate(0, 0, -7).Format(utils.FormatDate)
 
-	sql := `SELECT a.company_id,a.company_name,a.credit_code,a.company_code,a.created_time,a.province,a.city,a.address,a.region_type,b.group_id,b.road_show_total,a.is_share,
+	sql := `SELECT a.company_id,a.company_name,a.credit_code,a.company_code,a.created_time,a.province,a.city,a.address,a.region_type,b.group_id,b.road_show_total,b.is_share,
 			CASE 
      WHEN GROUP_CONCAT(b.status) LIKE "%永续%" THEN 1
 	 WHEN GROUP_CONCAT(b.status) LIKE "%正式%" THEN 2
@@ -336,6 +340,10 @@ CASE
      WHEN GROUP_CONCAT(b.todo_status) LIKE "%未完成%" AND GROUP_CONCAT(b.todo_end_time) is not null THEN GROUP_CONCAT(b.todo_end_time)
 		 ELSE "9999-01-01" END
 as sort_todo_end_time,
+			GROUP_CONCAT(CASE 
+            WHEN b.is_share = 1 THEN CONCAT(b.status, '(共享)')
+            ELSE b.status 
+        END ORDER BY b.product_id ASC SEPARATOR '/') AS status_str,
 			GROUP_CONCAT(b.status ORDER BY b.product_id ASC SEPARATOR '/') AS status,
 			GROUP_CONCAT(DISTINCT b.seller_name ORDER BY b.product_id ASC SEPARATOR '/') AS seller_name,
 			GROUP_CONCAT(DISTINCT b.seller_id ORDER BY b.product_id ASC SEPARATOR '/') AS seller_ids,
@@ -368,8 +376,9 @@ as sort_todo_end_time,
             b.freeze_time,b.freeze_reason,b.renewal_reason,
 			b.view_total,
 			b.last_view_time,
-			a.share_seller,
-			a.share_seller_id,
+			GROUP_CONCAT(DISTINCT b.share_seller ORDER BY b.product_id ASC SEPARATOR '/') AS share_seller,
+			GROUP_CONCAT(DISTINCT b.share_seller_id ORDER BY b.product_id ASC SEPARATOR ',') AS share_seller_ids,
+			b.share_seller_id ,
 			MAX(b.last_view_time) as max_last_view_time,
 			MIN(b.last_view_time) as min_last_view_time,
 			MAX(b.end_date) as max_end_date,
@@ -377,9 +386,21 @@ as sort_todo_end_time,
 			SUM(b.view_total) as all_view_total,
 			SUM(b.try_out_day_total) as all_try_out_day_total,
 			IF(LEFT(GROUP_CONCAT(DISTINCT b.last_view_time ORDER BY b.product_id), 19) >= "` + t + `", 1, 0) AS week_view_active,
-			a.nation
+			a.nation,
+			c.latest_service_record,
+			d.first_date 
 			FROM company AS a
 			INNER JOIN company_product AS b ON a.company_id=b.company_id
+			LEFT JOIN (
+    SELECT company_id, MAX(create_time) AS latest_service_record
+    FROM company_service_record
+    GROUP BY company_id
+) AS c ON a.company_id = c.company_id
+			LEFT JOIN (
+    SELECT company_id,MIN(start_date) AS first_date
+    FROM company_contract WHERE status=1 
+    GROUP BY company_id
+) AS d ON a.company_id = d.company_id 
 			WHERE a.enabled=1  `
 	if condition != "" {
 		sql += condition
@@ -586,9 +607,6 @@ type CompanyDetail struct {
 	Address         string `description:"详细地址"`
 	RegionType      string `description:"地区类型，1：国内，2：国外"`
 	OpenCompanyCode string `description:"开放给第三方的客户编码，不让第三方定位我们的客户信息"`
-	IsShare         int    `description:"0:非共享用户,1:共享客户"`
-	ShareSeller     string `description:"共享销售员"`
-	ShareSellerId   int    `description:"共享销售员id"`
 	IsScrounge      int    `description:"是否白嫖 0不是 1是"`
 	Nation          string `description:"所属国家"`
 }
@@ -1726,7 +1744,7 @@ func GetShareCompanyList(condition, sortStr string, pars []interface{}, startSiz
 	t := time.Now().Local().AddDate(0, 0, -7).Format(utils.FormatDate)
 
 	sql := `SELECT a.company_id,a.company_name,a.credit_code,a.company_code,a.created_time,a.province,a.city,
-a.address,a.region_type,b.group_id,b.road_show_total,a.is_share,a.share_seller_id,a.share_seller,
+a.address,a.region_type,b.group_id,b.road_show_total,b.is_share,b.share_seller_id,b.share_seller,
 			CASE 
      WHEN GROUP_CONCAT(b.status) LIKE "%永续%" THEN 1
 	 WHEN GROUP_CONCAT(b.status) LIKE "%正式%" THEN 2
@@ -1746,7 +1764,10 @@ CASE
      WHEN GROUP_CONCAT(b.todo_status) LIKE "%未完成%" AND GROUP_CONCAT(b.todo_end_time) is not null THEN GROUP_CONCAT(b.todo_end_time)
 		 ELSE "9999-01-01" END
 as sort_todo_end_time,
-			GROUP_CONCAT(b.status ORDER BY b.product_id ASC SEPARATOR '/') AS status,
+			GROUP_CONCAT(CASE 
+            WHEN b.is_share = 1 THEN CONCAT(b.status, '(共享)')
+            ELSE b.status 
+        END ORDER BY b.product_id ASC SEPARATOR '/') AS status,
 			GROUP_CONCAT(DISTINCT b.seller_name ORDER BY b.product_id ASC SEPARATOR '/') AS seller_name,
 			GROUP_CONCAT(DISTINCT b.seller_id ORDER BY b.product_id ASC SEPARATOR '/') AS seller_ids,
 			GROUP_CONCAT(DISTINCT b.package_type ORDER BY b.product_id ASC SEPARATOR '/') AS package_types,
@@ -1776,6 +1797,9 @@ as sort_todo_end_time,
             b.freeze_time,b.freeze_reason,b.renewal_reason,
 			b.view_total,
 			b.last_view_time,
+			GROUP_CONCAT(DISTINCT b.share_seller ORDER BY b.product_id ASC SEPARATOR '/') AS share_seller,
+			GROUP_CONCAT(DISTINCT b.share_seller_id ORDER BY b.product_id ASC SEPARATOR ',') AS share_seller_ids,
+			b.share_seller_id ,
 			MAX(b.last_view_time) as max_last_view_time,
 			MIN(b.last_view_time) as min_last_view_time,
 			MAX(b.end_date) as max_end_date,
@@ -1929,3 +1953,10 @@ func GetCompanyListByCondition(condition string, pars []interface{}, fieldArr []
 	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }
+
+func GetOverseasCompanys() (items []*Company, err error) {
+	o := orm.NewOrm()
+	sql := ` SELECT * FROM company where region_type= '海外' `
+	_, err = o.Raw(sql).QueryRows(&items)
+	return
+}

models/company/company_permission.go

@@ -21,14 +21,19 @@ type ChartPermission struct {
 	ClassifyName        string    `description:"分类"`
 	PermissionType      int       `description:"1主观，2客观"`
 	Checked             bool      `description:"选中状态"`
+	ParentId            int       `description:"父级权限id"`
+	IsPublic            int       `description:"是否是公有权限1:公有权限，0私有权限"`
 }
 
 type PermissionSetItem struct {
-	ChartPermissionId int                  `description:"权限id"`
-	PermissionName    string               `description:"权限名称"`
-	PermissionType    int                  `description:"1主观，2客观"`
-	Checked           bool                 `description:"选中状态"`
-	Child             []*PermissionSetItem `description:"具体的主客观-方便前端的排版用的"`
+	ChartPermissionId int    `description:"权限id"`
+	PermissionName    string `description:"权限名称"`
+	PermissionType    int    `description:"1主观，2客观"`
+	ParentId          int    `description:"父级权限id"`
+	IsPublic          int    `description:"是否是公有权限1:公有权限，0私有权限"`
+	Checked           bool   `description:"选中状态"`
+
+	Child []*PermissionSetItem `description:"具体的主客观-方便前端的排版用的"`
 }
 
 type PermissionSetItemType struct {
@@ -58,26 +63,33 @@ type PermissionSetResp struct {
 }
 
 type ChartPermissionFirst struct {
-	ClassifyName string `description:"分类"`
+	ChartPermissionId int    `description:"权限id"`
+	ClassifyName      string `description:"分类"`
 }
 
 func GetPermissionSetItems(productId int, classifyName string) (items []*PermissionSetItem, err error) {
 	o := orm.NewOrm()
-	sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id=? AND classify_name=?  AND permission_type=0 ORDER BY sort ASC `
+	sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id=? AND classify_name=? AND parent_id>0 AND permission_type=0 ORDER BY sort ASC `
 	_, err = o.Raw(sql, productId, classifyName).QueryRows(&items)
 	return
 }
 
+func GetPermissionByProductId(productId int) (items []*PermissionSetItem, err error) {
+	o := orm.NewOrm()
+	sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id=? AND permission_type=0 ORDER BY sort ASC `
+	_, err = o.Raw(sql, productId).QueryRows(&items)
+	return
+}
 func GetPermissionSetItemsByType(productId int, classifyName string) (items []*PermissionSetItem, err error) {
 	o := orm.NewOrm()
-	sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id=? AND classify_name=?  AND permission_type!=2 ORDER BY sort ASC `
+	sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id=? AND classify_name=? AND parent_id>0 AND permission_type!=2 ORDER BY sort ASC `
 	_, err = o.Raw(sql, productId, classifyName).QueryRows(&items)
 	return
 }
 
 func GetPermissionSetSandoItems(productId int, classifyName string) (items []*PermissionLookItem, err error) {
 	o := orm.NewOrm()
-	sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id=? AND classify_name=?  ORDER BY sort ASC `
+	sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id=? AND classify_name=? AND parent_id>0 ORDER BY sort ASC `
 	_, err = o.Raw(sql, productId, classifyName).QueryRows(&items)
 	return
 }
@@ -164,16 +176,33 @@ type PermissionLookItem struct {
 	IsUpgrade          int                   `description:"是否升级，1是，0否"`
 	ExpensiveYx        int                   `description:"权益研选: 0-3w; 1-5w ,2: 10W"`
 	Points             float64               `description:"研选扣点包点数"`
+	ParentId           int                   `description:"父级权限id"`
+	IsPublic           int                   `description:"是否是公有权限1:公有权限，0私有权限"`
 	Child              []*PermissionLookItem `description:"子权限"`
 }
 
+// todo 确认是否需要删除
 func GetPermissionLookItems(productId int, classifyName string) (items []*PermissionLookItem, err error) {
 	o := orm.NewOrm()
-	sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id=? AND classify_name=? ORDER BY sort ASC `
+	sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id=? AND classify_name=? AND parent_id > 0 ORDER BY sort ASC `
 	_, err = o.Raw(sql, productId, classifyName).QueryRows(&items)
 	return
 }
 
+func GetPermissionLookItemsByProductId(productId int) (items []*PermissionLookItem, err error) {
+	o := orm.NewOrm()
+	sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id=? ORDER BY sort ASC `
+	_, err = o.Raw(sql, productId).QueryRows(&items)
+	return
+}
+
+func GetPermissionLookItemsByParentId(productId int, parentId int) (items []*PermissionLookItem, err error) {
+	o := orm.NewOrm()
+	sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id=? AND parent_id=? ORDER BY sort ASC `
+	_, err = o.Raw(sql, productId, parentId).QueryRows(&items)
+	return
+}
+
 func GetCompanyPermissionCheck(companyId, permissionId int) (count int, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT COUNT(1) AS count FROM company_report_permission AS a WHERE a.company_id=? AND a.chart_permission_id=? `
@@ -203,6 +232,7 @@ func GetPermissionIdById(permissionIds string) (allpermissionId string, err erro
 			FROM
 				chart_permission 
 			WHERE
+			    parent_id > 0 and 
 				product_permission_name IN (
 				SELECT
 					product_permission_name 
@@ -251,6 +281,7 @@ type PermissionVarietyResp struct {
 
 type PermissionVarietyItem struct {
 	ChartPermissionId int    `description:"权限id"`
+	ParentId          int    `description:"父级权限id"`
 	ClassifyName      string `orm:"column(permission_name)" description:"权限名称"`
 }
 
@@ -260,13 +291,21 @@ type PermissionVarietyList struct {
 	Items             []*PermissionVarietyItem
 }
 
+// todo 删除品种列表
 func GetPermissionVarietyItems(productId int, classifyName string) (items []*PermissionVarietyItem, err error) {
 	o := orm.NewOrm()
-	sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id=? AND classify_name=? GROUP BY permission_name ORDER BY sort ASC `
+	sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id=? AND classify_name=?  AND parent_id > 0 GROUP BY permission_name ORDER BY sort ASC `
 	_, err = o.Raw(sql, productId, classifyName).QueryRows(&items)
 	return
 }
 
+func GetPermissionVarietyItemsByProductId(productId int) (items []*PermissionVarietyItem, err error) {
+	o := orm.NewOrm()
+	sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id=? and parent_id > 0 GROUP BY permission_name ORDER BY sort ASC `
+	_, err = o.Raw(sql, productId).QueryRows(&items)
+	return
+}
+
 func GetCompanyReportPermission(companyId, productId int) (items []*CompanyReportPermission, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT * FROM company_report_permission WHERE company_id=? AND product_id=? `
@@ -349,10 +388,16 @@ func FixPermissionStatus(companyId, productId int, startDate, endDate, status st
 
 func GetPermissionLookItemsExt(productId string, classifyName string) (items []*PermissionLookItem, err error) {
 	o := orm.NewOrm()
-	sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id IN(` + productId + `) AND classify_name=? ORDER BY sort ASC `
+	sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id IN(` + productId + `) AND classify_name=? AND parent_id > 0 ORDER BY sort ASC `
 	_, err = o.Raw(sql, classifyName).QueryRows(&items)
 	return
 }
+func GetPermissionLookItemsExtByParentId(productId string, parentId int) (items []*PermissionLookItem, err error) {
+	o := orm.NewOrm()
+	sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id IN(` + productId + `) AND parent_id=? ORDER BY sort ASC `
+	_, err = o.Raw(sql, parentId).QueryRows(&items)
+	return
+}
 
 // 客户授权产品结构体（包含产品名称）
 type CompanyReportPermissionAndName struct {
@@ -429,7 +474,7 @@ func GetPermissionLookItemsSandO(permissionIds string) (items []*PermissionLookI
 
 func GetPermissionLookItemsSandOByName(permissionName string) (items []*PermissionLookItem, err error) {
 	o := orm.NewOrm()
-	sql := ` SELECT * FROM chart_permission WHERE enabled=1  AND product_id = 2 AND remark IN (` + permissionName + `) ORDER BY sort ASC `
+	sql := ` SELECT * FROM chart_permission WHERE enabled=1  AND product_id = 2 AND remark IN (` + permissionName + `) AND parent_id > 0 ORDER BY sort ASC `
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
@@ -458,7 +503,7 @@ func GetGroupNamesById(gid int) (items *string, err error) {
 // GetChartPermissionFirst 获取排序后的权限分类
 func GetChartPermissionFirst() (list []*ChartPermissionFirst, err error) {
 	o := orm.NewOrm()
-	sql := ` SELECT classify_name FROM chart_permission_first ORDER BY yb_index_sort ASC `
+	sql := ` SELECT chart_permission_id, classify_name FROM chart_permission where enabled =1 and product_id=1 and parent_id=0 ORDER BY sort ASC `
 	_, err = o.Raw(sql).QueryRows(&list)
 	return
 }
@@ -543,7 +588,7 @@ func GetPermissionIdsByPermissionNames(names []string) (ids []int, err error) {
 			FROM
 				chart_permission
 			WHERE
-				chart_permission_name IN (` + utils.GetOrmInReplace(len(names)) + `)`
+				chart_permission_name IN (` + utils.GetOrmInReplace(len(names)) + `) AND parent_id > 0 `
 	_, err = o.Raw(sql, names).QueryRows(&ids)
 	return
 }

models/company/company_product.go

@@ -56,6 +56,9 @@ type CompanyProduct struct {
 	CloseTime           time.Time `description:"关闭时间"`
 	OverseasLabel       int       `description:"海外客户试用子标签：1未分类、2  推进、3 跟踪、4 预备、"`
 	IsOverseas          int       `description:"是否显示在海外客户0:显示,1:不显示"`
+	IsShare             int       `description:"0:非共享用户,1:共享客户"`
+	ShareSeller         string    `description:"共享销售员"`
+	ShareSellerId       int       `description:"共享销售员id"`
 }
 
 // 新增客户产品
@@ -95,6 +98,9 @@ type CompanyProductDetail struct {
 	Scale            string    `description:"管理规模，空不填，1：:50亿以下，2：50~100亿，3：100亿以上。"`
 	SpecialSurplus   string    `description:"专项调研剩余次数"`
 	Points           string    `description:"公司研选服务剩余点数"`
+	IsShare          int       `description:"0:非共享用户,1:共享客户"`
+	ShareSeller      string    `description:"共享销售员"`
+	ShareSellerId    int       `description:"共享销售员id"`
 	PermissionList   []*PermissionLookList
 }
 

models/contract/contract_service_detail.go

@@ -21,7 +21,16 @@ type ContractServiceDetail struct {
 	CreateTime        time.Time `description:"数据添加时间"`
 }
 
-//根据服务模板id获取对应的套餐表格数据详情
+type ServiceTemplateDetailCol2 struct {
+	CanEdit  bool   `json:"CanEdit"`
+	Type     string `json:"Type"`
+	ValueId  []int  `json:"ValueId"`
+	Value    string `json:"Value"`
+	HeadName string `json:"HeadName"`
+	RowName  string `json:"RowName"`
+}
+
+// 根据服务模板id获取对应的套餐表格数据详情
 func GetContractServiceDetailByTemplateId(serviceTemplateId int) (list []*ContractServiceDetail, err error) {
 	o := orm.NewOrm()
 	sql := `select * from contract_service_detail where service_template_id = ? and contract_service_id = 0 order by id asc`
@@ -45,7 +54,7 @@ func GetContractServiceDetailListByServiceIds(contractServiceIds string) (list [
 	return
 }
 
-//根据服务模板id获取对应的套餐表格数据详情
+// 根据服务模板id获取对应的套餐表格数据详情
 func GetContractServiceDetailList() (list []*ContractServiceDetail, err error) {
 	o := orm.NewOrm()
 	sql := `select * from contract_service_detail order by id asc`

models/cygx/activity.go

@@ -722,3 +722,11 @@ func UpdateActivityTopTime(activityId, topTime int) (err error) {
 	_, err = o.Raw(sql, topTime, activityId).Exec()
 	return
 }
+
+// 添加朋友圈分享封面图片
+func UpdateCygxActivityMomentsImg(momentsImg string, activityId int) (err error) {
+	sql := `UPDATE cygx_activity SET  moments_img=?  WHERE activity_id=? `
+	o := orm.NewOrmUsingDB("hz_cygx")
+	_, err = o.Raw(sql, momentsImg, activityId).Exec()
+	return
+}

models/cygx/chart_permission.go

@@ -32,7 +32,7 @@ func GetChartPermissionAll() (items []*ChartPermission, err error) {
 // 获取带有ICo的产业
 func GetChartPermissionIco(condition string) (items []*ChartPermission, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT * FROM chart_permission  WHERE 1=1 `
+	sql := `SELECT * FROM chart_permission  WHERE parent_id>0 `
 	if condition != "" {
 		sql += condition
 	}
@@ -44,7 +44,7 @@ func GetChartPermissionIco(condition string) (items []*ChartPermission, err erro
 // 获取带有ICo的产业
 func GetChartPermissionIcoNew(condition string) (items []*CygxRSlChartPermissionIcoTmp, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT chart_permission_id ,chart_permission_name,image_url as ico_link FROM chart_permission  WHERE 1=1 `
+	sql := `SELECT chart_permission_id ,chart_permission_name,image_url as ico_link FROM chart_permission  WHERE parent_id>0 `
 	if condition != "" {
 		sql += condition
 	}
@@ -56,7 +56,7 @@ func GetChartPermissionIcoNew(condition string) (items []*CygxRSlChartPermission
 // 获取带有ICo的产业
 func GetChartPermissionIcoDetail(condition string) (items []*CygxRSlChartPermissionIco, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT chart_permission_id ,chart_permission_name,image_url as ico_link FROM chart_permission  WHERE 1=1 `
+	sql := `SELECT chart_permission_id ,chart_permission_name,image_url as ico_link FROM chart_permission  WHERE parent_id>0 `
 	if condition != "" {
 		sql += condition
 	}
@@ -68,7 +68,7 @@ func GetChartPermissionIcoDetail(condition string) (items []*CygxRSlChartPermiss
 // 获取带有ICo的产业
 func GetChartPermissionDetail(condition string) (items []*CygxReportSelectionChart, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT chart_permission_id ,chart_permission_name,image_url as ico_link FROM chart_permission  WHERE 1=1 `
+	sql := `SELECT chart_permission_id ,chart_permission_name,image_url as ico_link FROM chart_permission  WHERE parent_id>0 `
 	if condition != "" {
 		sql += condition
 	}
@@ -80,21 +80,21 @@ func GetChartPermissionDetail(condition string) (items []*CygxReportSelectionCha
 // 没有策略的顶级分类
 func GetChartPermissionAllNoTactics() (items []*ChartPermission, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT * FROM chart_permission WHERE product_id=2 AND show_type=1 AND is_report=1 AND chart_permission_id != 23 AND is_other = 0 AND permission_type != 2   ORDER BY sort ASC   `
+	sql := `SELECT * FROM chart_permission WHERE product_id=2 AND show_type=1 AND is_report=1 AND chart_permission_id != 23 AND is_other = 0 AND permission_type != 2 AND parent_id>0  ORDER BY sort ASC   `
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
 
 func GetChartPermissionOtherAll() (items []*ChartPermission, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT * FROM chart_permission WHERE product_id=2 AND show_type=1 AND is_report=1  AND permission_type != 2   OR is_other = 1  ORDER BY sort ASC`
+	sql := `SELECT * FROM chart_permission WHERE product_id=2 AND show_type=1 AND is_report=1  AND permission_type != 2   OR is_other = 1 AND parent_id>0  ORDER BY sort ASC`
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
 
 // 获取产业数量
 func GetChartPermissionCount(condition string, pars []interface{}) (count int, err error) {
-	sqlCount := ` SELECT COUNT(1) AS count  FROM chart_permission WHERE 1=1 `
+	sqlCount := ` SELECT COUNT(1) AS count  FROM chart_permission WHERE parent_id>0 `
 	if condition != "" {
 		sqlCount += condition
 	}
@@ -117,7 +117,7 @@ func GetCategoryInfoByName(name string) (item *ChartPermission, err error) {
 		name = "宏观经济"
 	}
 	o := orm.NewOrm()
-	sql := `SELECT * FROM chart_permission WHERE permission_name=?`
+	sql := `SELECT * FROM chart_permission WHERE permission_name=? AND parent_id>0`
 	err = o.Raw(sql, name).QueryRow(&item)
 	return
 }
@@ -132,14 +132,14 @@ type ReportMapping struct {
 
 func GetReportMapping() (item []*ReportMapping, err error) {
 	o := orm.NewOrmUsingDB("hz_cygx")
-	sql := ` SELECT *  FROM	cygx_report_mapping WHERE	match_type_name != ''  `
+	sql := ` SELECT *  FROM	cygx_report_mapping WHERE	match_type_name != '' `
 	_, err = o.Raw(sql).QueryRows(&item)
 	return
 }
 
 func GetReportMappingDetail(condition string, pars []interface{}) (item *ReportMapping, err error) {
 	o := orm.NewOrmUsingDB("hz_cygx")
-	sql := ` SELECT *  FROM	cygx_report_mapping WHERE	 1= 1  ` + condition + ` LIMIT 1 `
+	sql := ` SELECT *  FROM	cygx_report_mapping WHERE 1=1 ` + condition + ` LIMIT 1 `
 	err = o.Raw(sql, pars).QueryRow(&item)
 	return
 }

models/cygx/cygx_yanxuan_special_user.go

@@ -25,6 +25,8 @@ type CygxYanxuanSpecialAuthor struct {
 	Status       int       // 1启用2禁用
 	CompanyId    int       `description:"公司id"`
 	CompanyName  string    `description:"公司名称"`
+	InviteName   string    //引荐人
+	Remark       string    //备注
 }
 
 type CygxYanxuanSpecialAuthorItem struct {
@@ -51,6 +53,15 @@ type CygxYanxuanSpecialAuthorItem struct {
 	FansNum            int    // 粉丝数量
 	ArticleCollectNum  int    // 文章收藏数量
 	SpecialAuthorId    int    //cygx_yanxuan_special_author 表主键ID 作者专栏ID
+	InviteName         string //引荐人
+	Remark             string //备注
+}
+
+type CygxYanxuanSpecialKeyWordReesp struct {
+	KeyWord string //引荐人
+}
+type CygxYanxuanSpecialKeyWordListReesp struct {
+	List []*CygxYanxuanSpecialKeyWordReesp //引荐人
 }
 
 func AddCygxYanxuanSpecialAuthor(item *CygxYanxuanSpecialAuthor) (lastId int64, err error) {
@@ -60,9 +71,11 @@ func AddCygxYanxuanSpecialAuthor(item *CygxYanxuanSpecialAuthor) (lastId int64,
 }
 
 type AddCygxYanxuanSpecialAuthorReq struct {
-	UserId   int    // 用户ID
-	RealName string // 姓名
-	Mobile   string // 手机号
+	UserId     int    // 用户ID
+	RealName   string // 姓名
+	Mobile     string // 手机号
+	InviteName string //引荐人
+	Remark     string //备注
 }
 
 type EnableCygxYanxuanSpecialAuthorReq struct {
@@ -147,3 +160,12 @@ func UpdateSpecialAuthormobile_init(mobile_init string, userId int) (err error)
 	_, err = o.Raw(sql, mobile_init, userId).Exec()
 	return
 }
+
+// 更新作者引荐人相关信息
+func UpdateYanxuanSpecialAuthorInviteName(inviteName, remark string, userId int) (err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := ``
+	sql = `UPDATE cygx_yanxuan_special_author SET invite_name=? , remark = ?  WHERE user_id = ? `
+	_, err = o.Raw(sql, inviteName, remark, userId).Exec()
+	return
+}

models/cygx/summary_manage.go

@@ -131,6 +131,7 @@ type CygxArticleResp struct {
 	SubCategoryName    string    `description:"主题名称"`
 	LinkArticleId      int       `description:"报告ID链接"`
 	NickName           string    `description:"作者昵称"`
+	HeadImgUrl         string    `description:"作者头像"`
 	SubjectIds         string    `description:"报告所关联的标的"`
 	AdminId            int       `description:"销售/管理员ID"`
 	AdminName          string    `description:"销售/管理员姓名"`
@@ -205,7 +206,7 @@ func GetArticleIdInfoBySummaryManageId(summaryManageId int) (item *CygxArticleRe
 // 通过文章ID获取文章、以及所关联的标的详情
 func GetArticleInfoOtherByArticleId(articleId int) (item *CygxArticleResp, err error) {
 	o := orm.NewOrmUsingDB("hz_cygx")
-	sql := `SELECT art.* ,dm.nick_name  FROM cygx_article as art 
+	sql := `SELECT art.* ,dm.nick_name ,dm.img_url as head_img_url   FROM cygx_article as art 
 			LEFT JOIN cygx_article_department as dm ON dm.department_id = art.department_id  WHERE article_id=? `
 	err = o.Raw(sql, articleId).QueryRow(&item)
 	return
@@ -592,3 +593,11 @@ func UpdateArticleTopTime(activityId, topTime int) (err error) {
 	_, err = o.Raw(sql, topTime, activityId).Exec()
 	return
 }
+
+// 添加朋友圈分享封面图片
+func UpdateCygxArticleMomentsImg(momentsImg string, articleId int) (err error) {
+	sql := `UPDATE cygx_article SET  moments_img=?  WHERE article_id=? `
+	o := orm.NewOrmUsingDB("hz_cygx")
+	_, err = o.Raw(sql, momentsImg, articleId).Exec()
+	return
+}

models/cygx/user_admin_share_history.go

@@ -0,0 +1,76 @@
+package cygx
+
+import (
+	"github.com/beego/beego/v2/client/orm"
+	"github.com/rdlucklib/rdluck_tools/paging"
+	"time"
+)
+
+type CygxUserAdminShareHistory struct {
+	UserAdminShareHistoryId int       `orm:"column(user_admin_share_history_id);pk";comment:"主键ID"`
+	Action                  string    `comment:"动作内容"`
+	UserId                  int       `comment:"用户ID"`
+	Mobile                  string    `comment:"手机号"`
+	Email                   string    `comment:"邮箱"`
+	CompanyId               int       `comment:"公司ID"`
+	CompanyName             string    `comment:"公司名称"`
+	RealName                string    `comment:"用户实际名称"`
+	SellerName              string    `comment:"所属销售名称"`
+	SellerId                int       `comment:"所属销售ID"`
+	ShareId                 int       `comment:"分享人ID"`
+	ShareName               string    `comment:"分享人姓名"`
+	Source                  string    `comment:"来源（article, activity, login）"`
+	SourceId                int       `comment:"来源 ID"`
+	SourceTitle             string    `comment:"来源名称，活动或者报告标题"`
+	RegisterPlatform        int       `comment:"注册平台（1: 小程序, 2: 网页）"`
+	CreateTime              time.Time `comment:"创建时间"`
+	ModifyTime              time.Time `comment:"修改时间"`
+}
+
+type CygxUserAdminShareHistoryResp struct {
+	UserAdminShareHistoryId int    `orm:"column(user_admin_share_history_id);pk";comment:"主键ID"`
+	Action                  string `comment:"动作内容"`
+	UserId                  int    `comment:"用户ID"`
+	Mobile                  string `comment:"手机号"`
+	Email                   string `comment:"邮箱"`
+	CompanyId               int    `comment:"公司ID"`
+	CompanyName             string `comment:"公司名称"`
+	RealName                string `comment:"用户实际名称"`
+	ShareId                 int    `comment:"分享人ID"`
+	ShareName               string `comment:"分享人姓名"`
+	Source                  string `comment:"来源（article, activity, login）"`
+	SourceId                int    `comment:"来源 ID"`
+	SourceTitle             string `comment:"来源名称，活动或者报告标题"`
+	RegisterPlatform        int    `comment:"注册平台（1: 小程序, 2: 网页）"`
+	RegisterPlatformText    string `comment:"注册平台（1: 小程序, 2: 网页）"`
+	CreateTime              string `comment:"创建时间"`
+	HttpUrl                 string `comment:"跳转地址"`
+}
+
+type GetCygxUserAdminShareHistoryListResp struct {
+	Paging *paging.PagingItem `description:"分页数据"`
+	List   []*CygxUserAdminShareHistoryResp
+}
+
+// 获取数量
+func GetCygxUserAdminShareHistoryCount(condition string, pars []interface{}) (count int, err error) {
+	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_user_admin_share_history as a WHERE 1= 1  `
+	if condition != "" {
+		sqlCount += condition
+	}
+	o := orm.NewOrmUsingDB("hz_cygx")
+	err = o.Raw(sqlCount, pars).QueryRow(&count)
+	return
+}
+
+// 列表
+func GetCygxUserAdminShareHistoryList(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxUserAdminShareHistoryResp, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := `SELECT * FROM cygx_user_admin_share_history as a WHERE 1= 1 `
+	if condition != "" {
+		sql += condition
+	}
+	sql += ` LIMIT ?,?  `
+	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	return
+}

models/eta_trial/eta_trial_manual.go

@@ -15,7 +15,7 @@ type ETATrialManualClassify struct {
 // GetETATrialManualClassify 获取ETA试用手工数据分类
 func GetETATrialManualClassify() (items []*ETATrialManualClassify, err error) {
 	o := orm.NewOrmUsingDB("weekly_trial")
-	sql := `SELECT classify_id, classify_name, parent_id FROM edb_trial.edbdata_classify WHERE is_show=1 ORDER BY sort ASC`
+	sql := `SELECT classify_id, classify_name, parent_id FROM edb_trial_new.edbdata_classify WHERE is_show=1 ORDER BY sort ASC`
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
@@ -31,7 +31,7 @@ func GetNoAuthTrialUserIds() (items []*ETATrialUserAdmin, err error) {
 	o := orm.NewOrmUsingDB("weekly_trial")
 	sql := `SELECT a.admin_id, a.real_name FROM weekly_report_trial.admin AS a
 			WHERE a.admin_id NOT IN (
-				SELECT DISTINCT b.admin_id FROM hz_data_trial.manual_user_classify AS b
+				SELECT DISTINCT b.admin_id FROM hz_data_trial_new.manual_user_classify AS b
 			)
 			AND a.department_id = 12 AND a.department_name = "ETA试用客户"`
 	_, err = o.Raw(sql).QueryRows(&items)
@@ -54,14 +54,14 @@ func InsertTrialUserManualAuth(adminId int, adminRealName string, classifyIds []
 	}()
 
 	// 新增权限用户
-	sql := `INSERT INTO hz_data_trial.manual_user (admin_id, admin_real_name, sys_user_id, sys_user_real_name, create_time) VALUES ("%d", "%s", 0, "", NOW())`
+	sql := `INSERT INTO hz_data_trial_new.manual_user (admin_id, admin_real_name, sys_user_id, sys_user_real_name, create_time) VALUES ("%d", "%s", 0, "", NOW())`
 	sql = fmt.Sprintf(sql, adminId, adminRealName)
 	if _, err = tx.Raw(sql).Exec(); err != nil {
 		return
 	}
 	// 新增权限分类
 	for i := range classifyIds {
-		sql = `INSERT INTO hz_data_trial.manual_user_classify (admin_id, classify_id, create_time) VALUES ("%d", "%d", NOW())`
+		sql = `INSERT INTO hz_data_trial_new.manual_user_classify (admin_id, classify_id, create_time) VALUES ("%d", "%d", NOW())`
 		sql = fmt.Sprintf(sql, adminId, classifyIds[i])
 		if _, err = tx.Raw(sql).Exec(); err != nil {
 			return

models/overseas_custom/custom.go

@@ -354,3 +354,42 @@ GROUP BY a.company_id `
 	_, err = o.Raw(sql, keyword, keyword, keyword, keyword).QueryRows(&companyIds)
 	return
 }
+
+func GetOverseasCustomList(condition string, pars []interface{}) (list []*Custom, err error) {
+	o := orm.NewOrm()
+	sql := ``
+	var databaseName string
+	if utils.RunMode == "debug" {
+		databaseName = "test_v2_hongze_rddp"
+	} else {
+		databaseName = "hongze_rddp"
+	}
+
+	sql = `SELECT * FROM (
+				SELECT a.company_id,a.company_name,a.nation,b.seller_id,b.seller_name,
+				b.view_total,b.road_show_total,a.created_time AS create_time,b.last_view_time,a.is_hide,a.overseas_status,
+				2 AS source,b.overseas_label,a.reset_btn
+				FROM company AS a
+				INNER JOIN company_product AS b ON a.company_id=b.company_id
+				INNER JOIN overseas_custom_seller AS c ON b.seller_id=c.seller_id
+				WHERE b.product_id=1 AND b.is_overseas = 0`
+	sql += `
+				UNION ALL
+				SELECT t.company_id+10000000,t.company_name,t.nation,t.seller_id,t.seller_name,
+				t.view_total,t.road_show_total,t.create_time,t.last_view_time,t.is_hide,t.overseas_status,
+				1 AS source,t.overseas_label,t.reset_btn
+				FROM %s.english_company AS t
+				INNER JOIN overseas_custom_seller AS n ON t.seller_id=n.seller_id
+             WHERE 1=1 AND t.is_deleted=0 `
+
+	sql += `		)AS m WHERE 1=1 `
+
+	if condition != "" {
+		sql += condition
+	}
+
+
+	sql = fmt.Sprintf(sql, databaseName)
+	_, err = o.Raw(sql, pars).QueryRows(&list)
+	return
+}

models/report_chapter_type.go

@@ -2,7 +2,6 @@ package models
 
 import (
 	"github.com/beego/beego/v2/client/orm"
-	"github.com/rdlucklib/rdluck_tools/paging"
 	"hongze/hz_crm_api/utils"
 	"time"
 )
@@ -299,9 +298,8 @@ type UpdateReportChapterTypeResp struct {
 	Week []*ReportChapterType `description:"所有周报品种"`
 }
 
-type ReportChapterTypePageListResp struct {
-	List   []*ReportChapterTypeListItem
-	Paging *paging.PagingItem `description:"分页数据"`
+type ReportChapterTypeListResp struct {
+	List []*ReportChapterTypeListItem
 }
 
 // GetReportChapterTypeCount 获取章节类型总数
@@ -314,13 +312,12 @@ func GetReportChapterTypeCount(condition string, pars []interface{}) (count int,
 }
 
 // GetReportChapterTypeList 获取章节类型列表
-func GetReportChapterTypePageList(condition string, pars []interface{}, startSize, pageSize int) (list []*ReportChapterType, err error) {
+func GetReportChapterTypePageList(condition string, pars []interface{}) (list []*ReportChapterType, err error) {
 	o := orm.NewOrm()
 	sql := ` SELECT * FROM report_chapter_type WHERE 1 = 1 `
 	sql += condition
 	sql += ` ORDER BY sort ASC, created_time DESC`
-	sql += ` LIMIT ?,?`
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&list)
+	_, err = o.Raw(sql, pars).QueryRows(&list)
 	return
 }
 
@@ -336,6 +333,7 @@ type ReportChapterTypeListItem struct {
 	WordsImage            string `description:"带字的icon"`
 	EditImgUrl            string `description:"管理后台编辑时选用的图"`
 	IsShow                int    `description:"显示隐藏: 1-显示; 0-隐藏"`
+	Enabled               int    `description:"是否可用，1可用，0禁用"`
 }
 
 // ReportChapterTypeAddReq 新增章节类型请求体
@@ -352,15 +350,12 @@ type ReportChapterTypeAddReq struct {
 
 // ReportChapterTypeEditReq 编辑章节类型请求体
 type ReportChapterTypeEditReq struct {
-	ReportChapterTypeId   int    `description:"报告章节类型id"`
-	ReportChapterTypeName string `description:"报告章节类型名称"`
-	Sort                  int    `description:"排序字段"`
-	ResearchType          string `description:"研报类型"`
-	SelectedImage         string `description:"选中时的icon"`
-	UnselectedImage       string `description:"未选中时的icon"`
-	WordsImage            string `description:"带字的icon"`
-	EditImgUrl            string `description:"管理后台编辑时选用的图"`
-	IsShow                int    `description:"显示隐藏: 1-显示; 0-隐藏"`
+	ReportChapterTypeId int    `description:"报告章节类型id"`
+	SelectedImage       string `description:"选中时的icon"`
+	UnselectedImage     string `description:"未选中时的icon"`
+	WordsImage          string `description:"带字的icon"`
+	EditImgUrl          string `description:"管理后台编辑时选用的图"`
+	IsShow              int    `description:"显示隐藏: 1-显示; 0-隐藏"`
 }
 
 // ReportChapterTypeDelReq 删除章节类型请求体

models/roadshow/calendar.go

@@ -159,9 +159,13 @@ type ResearcherIds struct {
 type ResearcherGroup struct {
 	GroupId        int    `description:"分组id"`
 	GroupName      string `description:"分组名称"`
-	ResearcherList []*Researcher
+	AdminId        int    `description:"研究员id"`
+	RealName       string `description:"研究员名称"`
+	RoleTypeCode   string `description:"角色编码"`
+	ResearcherList []*ResearcherGroup
 }
 
+
 func GetResearcherGroup() (list []*ResearcherGroup, err error) {
 	o := orm.NewOrm()
 	sql := ` SELECT group_id,group_name FROM admin AS a
@@ -175,7 +179,7 @@ func GetResearcherGroup() (list []*ResearcherGroup, err error) {
 	return
 }
 
-func GetResearcher() (list []*Researcher, err error) {
+func GetResearcher() (list []*ResearcherGroup, err error) {
 	o := orm.NewOrm()
 	sql := ` SELECT * FROM admin AS a
 			WHERE a.role_type_code IN('researcher','rai_researcher','ficc_researcher','ficc_admin')
@@ -192,7 +196,7 @@ func GetChoiceResearcher(adminIds string) (list []*Researcher, err error) {
 }
 
 // GetResearcherV2 获取研究员列表（冻结的也要）
-func GetResearcherV2() (list []*Researcher, err error) {
+func GetResearcherV2() (list []*ResearcherGroup, err error) {
 	o := orm.NewOrm()
 	sql := ` SELECT * FROM admin AS a
 			WHERE a.role_type_code IN('researcher','rai_researcher','ficc_researcher','ficc_admin')
@@ -904,3 +908,80 @@ func GetOverseaCustomCalendarList(keyword, sellerId, researcherId, startDate, en
 
 	return
 }
+
+func GetOverseaCustomCalendarList2(sellerId, researcherId, startDate, endDate, companyStatus string) (list []*RsReportRecordList, err error) {
+	var databaseName string
+	if utils.RunMode == "debug" {
+		databaseName = "test_v2_hongze_rddp"
+	} else {
+		databaseName = "hongze_rddp"
+	}
+	companyStatusList := make([]string, 0)
+	if companyStatus != "" {
+		companyStatusList = strings.Split(companyStatus, ",")
+	}
+	lenCompanyStatusList := len(companyStatusList)
+
+	o := orm.NewOrm()
+
+	pars := make([]interface{}, 0)
+
+	sql1 := `SELECT b.start_date,b.end_date,b.start_time,b.end_time,a.rs_calendar_id,b.seller_id,b.seller_name,b.researcher_name,b.company_name,b.company_id,d.overseas_status as company_status,b.roadshow_type,a.theme,a.roadshow_platform,a.province as province,a.city as city FROM  rs_calendar AS a
+    INNER JOIN rs_report_record  AS b ON a.rs_calendar_id=b.rs_calendar_id
+         JOIN company_product AS c ON a.company_id=c.company_id AND c.product_id=1
+         JOIN company AS d ON c.company_id=d.company_id 
+				INNER JOIN overseas_custom_seller AS f ON c.seller_id=f.seller_id
+		where c.is_overseas = 0 and  a.english_company= 0 AND a.source = 0  AND b.rs_calendar_researcher_status=2 AND b.researcher_id != 0`
+
+	if startDate != "" {
+		sql1 += ` AND b.start_date >= ? `
+		pars = append(pars, startDate)
+	}
+	if endDate != "" {
+		sql1 += ` AND b.start_date <= ? `
+		pars = append(pars, endDate)
+	}
+	if lenCompanyStatusList > 0 {
+		sql1 += ` AND d.overseas_status in (` + utils.GetOrmInReplace(lenCompanyStatusList) + ") "
+		pars = append(pars, companyStatusList)
+	}
+	if sellerId != "" {
+		sql1 += fmt.Sprintf(` AND b.seller_id in (%s) `, sellerId)
+	}
+	if researcherId != "" {
+		sql1 += fmt.Sprintf(` AND b.researcher_id in (%s) `, researcherId)
+	}
+	sql2 := fmt.Sprintf(`SELECT bb.start_date,bb.end_date,bb.start_time,bb.end_time,aa.rs_calendar_id,bb.seller_id,bb.seller_name,bb.researcher_name,aa.company_name,aa.company_id,cc.overseas_status as company_status,bb.roadshow_type,aa.theme,aa.roadshow_platform,aa.province as province,aa.city as city FROM  rs_calendar AS aa
+    INNER JOIN rs_report_record  AS bb ON aa.rs_calendar_id=bb.rs_calendar_id
+    INNER JOIN %s.english_company AS cc ON aa.company_id=cc.company_id
+		where aa.english_company= 1 AND aa.source = 0 AND cc.is_deleted=0  AND bb.rs_calendar_researcher_status=2 AND bb.researcher_id != 0 `, databaseName)
+
+
+	if startDate != "" {
+		sql2 += ` AND bb.start_date >= ?  `
+		pars = append(pars, startDate)
+	}
+	if endDate != "" {
+		sql2 += ` AND bb.start_date <= ?  `
+		pars = append(pars, endDate)
+	}
+	if lenCompanyStatusList > 0 {
+		sql2 += ` AND cc.overseas_status in (` + utils.GetOrmInReplace(lenCompanyStatusList) + ") "
+		pars = append(pars, companyStatusList)
+	}
+	if sellerId != "" {
+		sql2 += fmt.Sprintf(` AND bb.seller_id in (%s) `, sellerId)
+	}
+	if researcherId != "" {
+		sql2 += fmt.Sprintf(` AND bb.researcher_id in (%s) `, researcherId)
+	}
+	// 列表数据
+	sql := `SELECT m.*  FROM (` + sql1 + ` UNION ALL ` + sql2
+	sql += ` ) AS m  WHERE 1=1 `
+
+
+	sql += ` Group by rs_calendar_id  `
+	_, err = o.Raw(sql, pars).QueryRows(&list)
+
+	return
+}

models/roadshow/company.go

@@ -39,7 +39,7 @@ func CompanySearchV2(sellerId int, keyWord string) (list []*CompanySearchView, e
 				company AS a
 			INNER JOIN company_product AS b ON a.company_id = b.company_id AND b.product_id = 1
 			WHERE
-				b.status IN ('正式', '试用') AND (b.seller_id = ? OR a.share_seller_id = ?) AND a.company_name LIKE ?
+				b.status IN ('正式', '试用') AND (b.seller_id = ? OR b.share_seller_id = ?) AND a.company_name LIKE ?
 			GROUP BY
 				b.company_id`
 	_, err = o.Raw(sql, sellerId, sellerId, keyWord).QueryRows(&companies)

models/roadshow/report_record.go

@@ -1,7 +1,10 @@
 package roadshow
 
 import (
+	"fmt"
 	"github.com/beego/beego/v2/client/orm"
+	"hongze/hz_crm_api/utils"
+	"strings"
 	"time"
 )
 
@@ -229,3 +232,181 @@ func GetBusinessTripList(adminId int, startDate, endDate string) (list []*Busine
 	}
 	return
 }
+
+// GetOverseasGroupSellerRecordList 获取销售分组数据
+func _GetOverseasGroupSellerRecordList(condition string, pars []interface{}) (list []*RsReportRecordGroup, err error) {
+	o := orm.NewOrm()
+	sql := ` SELECT seller_id as admin_id,seller_group_id as group_id,seller_name admin_name,count(1) num
+				FROM  rs_report_record 
+				WHERE 1=1 and rs_calendar_researcher_status = 2 
+ `
+	if condition != "" {
+		sql += condition
+	}
+	sql += ` GROUP BY seller_id`
+	_, err = o.Raw(sql, pars).QueryRows(&list)
+
+	return
+}
+
+// OverseasAdminReportRecord 系统用户统计信息
+type OverseasAdminReportRecord struct {
+	Name                  string                      `description:"系统用户名"`
+	AdminId               int                         `description:"系统用户id"`
+	RsReportRecordNumList []RsOverseasReportRecordNum `description:"统计次数"`
+}
+
+// RsOverseasReportRecordNum 系统用户统计信息
+type RsOverseasReportRecordNum struct {
+	TryOutNum  int    `description:"试用路演次数"`
+	FormalNum  int    `description:"正式路演次数"`
+	CloseNum   int    `description:"关闭客户次数"`
+	OnlineNum  int    `description:"线上路演次数"`
+	OfflineNum int    `description:"线上路演次数"`
+	StartDate  string `description:"开始日期"`
+	EndDate    string `description:"结束日期"`
+	IsLook     bool   `description:"是否可以查看详情"`
+}
+
+// RsOverseasReportRecordResp 总统计信息
+type RsOverseasReportRecordResp struct {
+	List                  []OverseasAdminReportRecord `description:"系统用户分组信息"`
+	RsReportRecordNumList []RsOverseasReportRecordNum `description:"统计次数"`
+}
+
+
+
+func GetOverseasGroupResearcherRecordList(startDate, endDate, companyStatus string) (list []*RsReportRecordGroup, err error) {
+	var databaseName string
+	if utils.RunMode == "debug" {
+		databaseName = "test_v2_hongze_rddp"
+	} else {
+		databaseName = "hongze_rddp"
+	}
+	companyStatusList := make([]string, 0)
+	if companyStatus != "" {
+		companyStatusList = strings.Split(companyStatus, ",")
+	}
+	lenCompanyStatusList := len(companyStatusList)
+
+	o := orm.NewOrm()
+
+	pars := make([]interface{}, 0)
+
+	sql1 := `SELECT a.rs_calendar_id,b.researcher_id as admin_id,b.researcher_group_id as group_id,b.researcher_name AS admin_name FROM  rs_calendar AS a
+    INNER JOIN rs_report_record  AS b ON a.rs_calendar_id=b.rs_calendar_id
+         JOIN company_product AS c ON a.company_id=c.company_id AND c.product_id=1
+         JOIN company AS d ON c.company_id=d.company_id 
+				INNER JOIN overseas_custom_seller AS f ON c.seller_id=f.seller_id
+		where c.is_overseas = 0 and  a.english_company= 0 AND a.source = 0  AND b.rs_calendar_researcher_status=2 AND b.researcher_id != 0 `
+
+	if startDate != "" {
+		sql1 += ` AND b.start_date >= ? `
+		pars = append(pars, startDate)
+	}
+	if endDate != "" {
+		sql1 += ` AND b.end_date <= ? `
+		pars = append(pars, endDate)
+	}
+	if lenCompanyStatusList > 0 {
+		sql1 += ` AND d.overseas_status in (` + utils.GetOrmInReplace(lenCompanyStatusList) + ") "
+		pars = append(pars, companyStatusList)
+	}
+	//sql1 += ` GROUP BY admin_id `
+
+	sql2 := fmt.Sprintf(`SELECT aa.rs_calendar_id,bb.researcher_id as admin_id,bb.researcher_group_id as group_id,bb.researcher_name AS admin_name FROM rs_calendar AS aa
+    INNER JOIN rs_report_record  AS bb ON aa.rs_calendar_id=bb.rs_calendar_id
+    INNER JOIN %s.english_company AS cc ON aa.company_id=cc.company_id
+		where aa.english_company= 1 AND aa.source = 0 AND cc.is_deleted=0  AND bb.rs_calendar_researcher_status=2 AND bb.researcher_id != 0 `, databaseName)
+
+	if startDate != "" {
+		sql2 += ` AND bb.start_date >= ?  `
+		pars = append(pars, startDate)
+	}
+	if endDate != "" {
+		sql2 += ` AND bb.end_date <= ?  `
+		pars = append(pars, endDate)
+	}
+	if lenCompanyStatusList > 0 {
+		sql2 += ` AND cc.overseas_status in (` + utils.GetOrmInReplace(lenCompanyStatusList) + ") "
+		pars = append(pars, companyStatusList)
+	}
+	//sql2 += ` GROUP BY admin_id `
+
+	// 列表数据
+	sql := `SELECT m.*,count(1) as num  FROM (` + sql1 + ` UNION ALL ` + sql2
+	sql += ` ) AS m  WHERE 1=1 `
+
+	sql += ` Group by admin_id `
+	_, err = o.Raw(sql, pars).QueryRows(&list)
+
+	return
+}
+
+func GetOverseasGroupSellerRecordList(startDate, endDate, companyStatus string) (list []*RsReportRecordGroup, err error) {
+	var databaseName string
+	if utils.RunMode == "debug" {
+		databaseName = "test_v2_hongze_rddp"
+	} else {
+		databaseName = "hongze_rddp"
+	}
+	companyStatusList := make([]string, 0)
+	if companyStatus != "" {
+		companyStatusList = strings.Split(companyStatus, ",")
+	}
+	lenCompanyStatusList := len(companyStatusList)
+
+	o := orm.NewOrm()
+
+	pars := make([]interface{}, 0)
+
+	sql1 := `SELECT COUNT(DISTINCT a.rs_calendar_id) AS num,b.seller_id as admin_id,b.seller_group_id as group_id,b.seller_name AS admin_name FROM  rs_calendar AS a
+    INNER JOIN rs_report_record  AS b ON a.rs_calendar_id=b.rs_calendar_id
+         JOIN company_product AS c ON a.company_id=c.company_id AND c.product_id=1
+         JOIN company AS d ON c.company_id=d.company_id 
+		 INNER JOIN overseas_custom_seller AS f ON c.seller_id=f.seller_id
+		where c.is_overseas = 0 and  a.english_company= 0 AND a.source = 0  AND b.rs_calendar_researcher_status=2 AND b.researcher_id != 0`
+
+	if startDate != "" {
+		sql1 += ` AND b.start_date >= ? `
+		pars = append(pars, startDate)
+	}
+	if endDate != "" {
+		sql1 += ` AND b.end_date <= ? `
+		pars = append(pars, endDate)
+	}
+	if lenCompanyStatusList > 0 {
+		sql1 += ` AND d.overseas_status in (` + utils.GetOrmInReplace(lenCompanyStatusList) + ") "
+		pars = append(pars, companyStatusList)
+	}
+	sql1 += ` GROUP BY admin_id `
+
+	sql2 := fmt.Sprintf(`SELECT COUNT(DISTINCT aa.rs_calendar_id) AS num,bb.seller_id as admin_id,bb.seller_group_id as group_id,bb.seller_name AS admin_name FROM rs_calendar AS aa
+    INNER JOIN rs_report_record  AS bb ON aa.rs_calendar_id=bb.rs_calendar_id
+    INNER JOIN %s.english_company AS cc ON aa.company_id=cc.company_id
+		where aa.english_company= 1 AND aa.source = 0 AND cc.is_deleted=0  AND bb.rs_calendar_researcher_status=2 AND bb.researcher_id != 0 `, databaseName)
+
+	if startDate != "" {
+		sql2 += ` AND bb.start_date >= ?  `
+		pars = append(pars, startDate)
+	}
+	if endDate != "" {
+		sql2 += ` AND bb.end_date <= ?  `
+		pars = append(pars, endDate)
+	}
+	if lenCompanyStatusList > 0 {
+		sql2 += ` AND cc.overseas_status in (` + utils.GetOrmInReplace(lenCompanyStatusList) + ") "
+		pars = append(pars, companyStatusList)
+	}
+	sql2 += ` GROUP BY admin_id `
+
+	// 列表数据
+	sql := `SELECT m.*,SUM(m.num) AS num  FROM (` + sql1 + ` UNION ALL ` + sql2
+	sql += ` ) AS m  WHERE 1=1 `
+
+
+	sql += ` Group by admin_id `
+	_, err = o.Raw(sql, pars).QueryRows(&list)
+
+	return
+}

models/statistic_report/report.go

@@ -62,7 +62,10 @@ func GetTryGroupCompanyReportRecordGroupList(date time.Time, productId int) (lis
 type IncrementalCompanyListReq struct {
 	PageSize     int `description:"每页数据条数"`
 	CurrentIndex int `description:"当前页页码，从1开始"`
-	SortParam    string `description:"排序字段参数，用来排序的字段， 枚举值：'viewTotal':总阅读次数 、 'viewTime':阅读时间 、 'roadShowTotal':累计路演次数 、'expireDay'：到期时间 、 'createTime'：创建时间 、 'formalTime': 转正时间 、 'freezeTime'：冻结时间 、'lossTime'：流失时间" 、'deadline'：距离未完成的任务的截止日期的天数`
+	SortParam    string `description:"排序字段参数，用来排序的字段， 枚举值：'viewTotal':总阅读次数 、 
+'viewTime':阅读时间 、 'roadShowTotal':累计路演次数 、'expireDay'：到期时间 、 'createTime'：创建时间 、
+'formalTime': 转正时间 、 'freezeTime'：冻结时间 、'lossTime'：流失时间 、
+'deadline'：距离未完成的任务的截止日期的天数、sellerName:所属销售、shareSellerName:分配销售、status：客户状态"`
 	SortType     string `description:"如何排序，是正序还是倒序，枚举值：asc 正序,desc 倒叙 "`
 	CompanyIds   string `description:"标签，多个标签用、隔开；长度255"`
 }

routers/commentsRouter.go

@@ -2896,6 +2896,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:UserAdminShareHistoryController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:UserAdminShareHistoryController"],
+        beego.ControllerComments{
+            Method: "OrderList",
+            Router: `/mfyx/admin/share/list`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:UserController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:UserController"],
         beego.ControllerComments{
             Method: "OrderRefund",
@@ -3103,6 +3112,24 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:YanxuanSpecialController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:YanxuanSpecialController"],
+        beego.ControllerComments{
+            Method: "AuthorSearch",
+            Router: `/yanxuan_special/author/search`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:YanxuanSpecialController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:YanxuanSpecialController"],
+        beego.ControllerComments{
+            Method: "AuthorUpdate",
+            Router: `/yanxuan_special/author/update`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:YanxuanSpecialController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:YanxuanSpecialController"],
         beego.ControllerComments{
             Method: "Enable",
@@ -7423,6 +7450,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/roadshow:CalendarController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/roadshow:CalendarController"],
+        beego.ControllerComments{
+            Method: "OverseasCalendarList",
+            Router: `/overseas/calendar/list`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/roadshow:CalendarController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/roadshow:CalendarController"],
         beego.ControllerComments{
             Method: "OverseasCustomReportCalendarList",
@@ -7432,6 +7468,24 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/roadshow:CalendarController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/roadshow:CalendarController"],
+        beego.ControllerComments{
+            Method: "OverseasResearcherReportList",
+            Router: `/overseas_custom/researcher/list`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/roadshow:CalendarController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/roadshow:CalendarController"],
+        beego.ControllerComments{
+            Method: "OverseasSellerReportList",
+            Router: `/overseas_custom/seller/list`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/roadshow:CalendarController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/roadshow:CalendarController"],
         beego.ControllerComments{
             Method: "OverseasCustomCalendarAdminList",
@@ -8836,6 +8890,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hz_crm_api/controllers:ClassifyController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers:ClassifyController"],
+        beego.ControllerComments{
+            Method: "Edit",
+            Router: `/edit`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hz_crm_api/controllers:ClassifyController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers:ClassifyController"],
         beego.ControllerComments{
             Method: "ListClassify",
@@ -9664,6 +9727,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hz_crm_api/controllers:CompanySellerController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers:CompanySellerController"],
+        beego.ControllerComments{
+            Method: "ShareCheckList2",
+            Router: `/seller/check/Sharelist2`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hz_crm_api/controllers:CompanySellerController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers:CompanySellerController"],
         beego.ControllerComments{
             Method: "CheckList",
@@ -10420,6 +10492,24 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hz_crm_api/controllers:ReportChapterTypeController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers:ReportChapterTypeController"],
+        beego.ControllerComments{
+            Method: "Edit",
+            Router: `/chapter_type/edit`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["hongze/hz_crm_api/controllers:ReportChapterTypeController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers:ReportChapterTypeController"],
+        beego.ControllerComments{
+            Method: "List",
+            Router: `/chapter_type/list`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hz_crm_api/controllers:ReportController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers:ReportController"],
         beego.ControllerComments{
             Method: "GetDayWeekReportChapterTypeList",

routers/router.go

@@ -63,6 +63,7 @@ func init() {
 			web.NSInclude(
 				&controllers.ReportController{},
 				&controllers.ReportUploadCommonController{},
+				&controllers.ReportChapterTypeController{},
 			),
 		),
 		web.NSNamespace("/statistic_report",
@@ -158,6 +159,7 @@ func init() {
 				&cygx.ContractAllocationController{},
 				&cygx.QuestionnaireController{},
 				&cygx.AskserieVideoController{},
+				&cygx.UserAdminShareHistoryController{},
 				&cygx.OrderController{},
 			),
 		),

services/classify.go

@@ -0,0 +1,184 @@
+package services
+
+import (
+	"encoding/json"
+	"fmt"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/utils"
+	"io/ioutil"
+	"net/http"
+	"strings"
+)
+
+type GetClassifyListReq struct {
+	Keyword     string
+	CompanyType string
+	HideDayWeek int
+}
+
+type ClassifySetEnabledReq struct {
+	ClassifyId int `description:"分类ID"`
+	Enabled    int `description:"是否可用，1可用，0禁用"`
+}
+
+type EditClassifyReq struct {
+	ClassifyId int `description:"分类ID"`
+	/*Abstract          string                 `description:"栏目简介"`
+	Descript          string                 `description:"分享描述"`
+	ReportAuthor      string                 `description:"栏目作者"`
+	AuthorDescript    string                 `description:"作者简介"`
+	ColumnImgUrl      string                 `description:"栏目配图"`
+	ReportImgUrl      string                 `description:"报告配图"`
+	HeadImgUrl        string                 `description:"头部banner"`
+	AvatarImgUrl      string                 `description:"头像"`
+	HomeImgUrl        string                 `description:"首页配图"`*/
+	ClassifyLabel string `description:"分类标签"`
+	ShowType      int    `description:"展示类型：1-列表 2-专栏"`
+	/*HasTeleconference int                    `description:"是否有电话会：0-否 1-是"`
+	VipTitle          string                 `description:"研究员头衔"`*/
+	//Sort              int                    `description:"后台排序"`
+	IsShow         int                    `description:"是否在小程序显示：1-显示 0-隐藏"`
+	YbFiccSort     int                    `description:"小程序FICC页排序"`
+	YbFiccIcon     string                 `description:"小程序FICC页icon"`
+	YbFiccPcIcon   string                 `description:"小程序PC端FICC页背景图"`
+	YbIconUrl      string                 `description:"小程序已购页icon"`
+	YbBgUrl        string                 `description:"小程序已购详情背景图"`
+	YbListImg      string                 `description:"小程序研报列表封面图"`
+	YbShareBgImg   string                 `description:"小程序研报详情分享背景图"`
+	YbRightBanner  string                 `description:"Pc端详情页，右侧，报告合集背景图"`
+	MenuList       []*ClassifyMenuSaveReq `description:"子目录列表"`
+	ClassifyMenuId int                    `description:"二级分类-子目录ID"`
+	RelateTel      int                    `description:"是否在电话会中可选: 0-否; 1-是"`
+	RelateVideo    int                    `description:"是否在路演视频中可选: 0-否; 1-是"`
+}
+
+// ClassifyMenuSaveReq 保存分类子目录请求体
+type ClassifyMenuSaveReq struct {
+	MenuId   int    `description:"子目录ID, 0为新增, 大于0为编辑"`
+	MenuName string `description:"子目录名称"`
+}
+
+type CrmEtaBaseResp struct {
+	Code   int    `json:"code" description:"状态码"`
+	Msg    string `json:"msg" description:"提示信息"`
+	ErrMsg string `json:"-" description:"错误信息，不用返回给前端，只是做日志记录"`
+}
+
+func crmEtaPost(url string, param interface{}) (respBody []byte, err error) {
+	data, e := json.Marshal(param)
+	if e != nil {
+		err = fmt.Errorf("data json marshal err: %s", e.Error())
+		return
+	}
+
+	body := ioutil.NopCloser(strings.NewReader(string(data)))
+	client := &http.Client{}
+	req, e := http.NewRequest("POST", url, body)
+	if e != nil {
+		err = fmt.Errorf("http create request err: %s", e.Error())
+		return
+	}
+
+	contentType := "application/json;charset=utf-8"
+	req.Header.Set("Content-Type", contentType)
+	req.Header.Set("Authorization", utils.CrmEtaAuthorization)
+	resp, e := client.Do(req)
+	if e != nil {
+		err = fmt.Errorf("http client do err: %s", e.Error())
+		return
+	}
+	defer func() {
+		_ = resp.Body.Close()
+	}()
+	b, e := ioutil.ReadAll(resp.Body)
+	if e != nil {
+		err = fmt.Errorf("resp body read err: %s", e.Error())
+		return
+	}
+	if len(b) == 0 {
+		err = fmt.Errorf("resp body is empty")
+		return
+	}
+	// 生产环境解密, 注意有个坑前后的双引号
+	if utils.RunMode == "release" {
+		str := string(b)
+		str = strings.Trim(str, `"`)
+		b = utils.DesBase64Decrypt([]byte(str))
+	}
+
+	respBody = b
+	return
+}
+
+func EditReportClassify(pars *EditClassifyReq) (err error, errMsg string) {
+	if utils.CrmEtaServerUrl == "" {
+		return
+	}
+	url := fmt.Sprint(utils.CrmEtaServerUrl, "/api/eta/classify/edit")
+	b, err := crmEtaPost(url, pars)
+	if err != nil {
+		errMsg = "更新品种失败"
+		err = fmt.Errorf("url:%s err: %s", url, err.Error())
+		return
+	}
+	result := new(CrmEtaBaseResp)
+	if e := json.Unmarshal(b, &result); e != nil {
+		errMsg = "更新分类失败"
+		err = fmt.Errorf("result unmarshal err: %s\nresult: %s", e.Error(), string(b))
+		return
+	}
+	utils.FileLog.Info("%s", string(b))
+	if result.Code != 200 {
+		err = fmt.Errorf("result: %s, err: %s", string(b), result.ErrMsg)
+		errMsg = result.Msg
+		return
+	}
+	return
+}
+
+type EditClassifyPermissionReq struct {
+	Keyword               string
+	ChartPermissionIdList []int `description:"权限id数组"`
+	NewKeyword            string
+}
+
+// GetClassifyList 获取报告分类已绑定的权限
+func GetClassifyList(req *GetClassifyListReq) (list models.ClassifyListResp, err error) {
+	if utils.CrmEtaServerUrl == "" {
+		return
+	}
+	url := fmt.Sprint(utils.CrmEtaServerUrl, "/api/eta/classify/list")
+	b, err := crmEtaPost(url, req)
+	if err != nil {
+		err = fmt.Errorf("url:%s err: %s", url, err.Error())
+		return
+	}
+	//result := new(models.ResultData)
+	result := new(GetClassifyListResp)
+	if e := json.Unmarshal(b, &result); e != nil {
+		err = fmt.Errorf("result unmarshal err: %s\nresult: %s", e.Error(), string(b))
+		return
+	}
+	utils.FileLog.Info("%s", string(b))
+	if result.Code != 200 {
+		err = fmt.Errorf("result: %s", string(b))
+		return
+	}
+	list = result.Data
+	return
+}
+
+type ClassifyPermissionReq struct {
+	Keyword string
+}
+
+type ClassifyPermissionList struct {
+	List []*models.ChartPermissionSearchKeyWordMapping
+}
+
+type GetClassifyListResp struct {
+	Code   int                     `json:"code" description:"状态码"`
+	Msg    string                  `json:"msg" description:"提示信息"`
+	Data   models.ClassifyListResp `json:"data" description:"返回数据"`
+	ErrMsg string                  `json:"-" description:"错误信息，不用返回给前端，只是做日志记录"`
+}

services/company.go

@@ -820,7 +820,7 @@ func CheckAdminIsSeller(roleTypeCode string) (isSeller bool) {
 //}
 //
 
-func GetCompanyPermissionButton(roleTypeCode, status, itemSellerIds, itemGroupIdS string, itemGroupId, sysUserGroupId, itemSellerId, sysUserId, authority, productId, shareSellerId int) (button company.ButtonPermission) {
+func GetCompanyPermissionButton(roleTypeCode, status, itemSellerIds, itemGroupIdS string, itemGroupId, sysUserGroupId, itemSellerId, sysUserId, authority, productId, shareSellerId int, shareSellerIds string) (button company.ButtonPermission) {
 	//产品状态map
 	productStatusMap := make(map[int]string)
 	if productId == 1 {
@@ -860,6 +860,8 @@ func GetCompanyPermissionButton(roleTypeCode, status, itemSellerIds, itemGroupId
 		groupIdMap[2], _ = strconv.Atoi(groupIdSlice[1])
 	}
 
+	shareSellerIdArr := strings.Split(shareSellerIds, ",")
+
 	if roleTypeCode == utils.ROLE_TYPE_CODE_ADMIN { //超级管理员
 		button.BtnView = true //查看详情权限
 		if !strings.Contains(status, "/") {
@@ -952,11 +954,15 @@ func GetCompanyPermissionButton(roleTypeCode, status, itemSellerIds, itemGroupId
 				//button.BtnDelete = true
 				button.BtnModifySeller = true
 				button.BtnFreeze = false
+				// CRM14.7.2 权益管理员可以设置试用客户为共享
+				button.BtnShare = true
 			} else if productStatus == utils.COMPANY_STATUS_FREEZE { //冻结
 				button.BtnModifySeller = true
 			} else if productStatus == utils.COMPANY_STATUS_LOSE { //流失
 				//button.BtnDelete = true
 			} else { //永续
+				button.BtnModifySeller = true
+				button.BtnShare = true
 			}
 		} else {
 			productStatus2, hasProduct2 := productStatusMap[1]
@@ -982,7 +988,7 @@ func GetCompanyPermissionButton(roleTypeCode, status, itemSellerIds, itemGroupId
 
 			//如果是自己客户，那么拥有查看权限
 			if hasSellerId {
-				if sellerId == sysUserId || shareSellerId == sysUserId {
+				if sellerId == sysUserId || utils.InArrayByStr(shareSellerIdArr, strconv.Itoa(sysUserId)) || shareSellerId == sysUserId {
 					button.BtnView = true                             //显示权限、详情
 					if productStatus == utils.COMPANY_STATUS_FORMAL { //正式
 						button.BtnUpdate = true       //服务更新
@@ -1040,7 +1046,7 @@ func GetCompanyPermissionButton(roleTypeCode, status, itemSellerIds, itemGroupId
 					button.BtnRemarkView = true
 					//button.BtnThaw = false
 				} else if productStatus == utils.COMPANY_STATUS_LOSE { //流失
-					if sellerId == sysUserId || groupId == sysUserGroupId || shareSellerId == sysUserId {
+					if sellerId == sysUserId || groupId == sysUserGroupId || utils.InArrayByStr(shareSellerIdArr, strconv.Itoa(sysUserId)) || shareSellerId == sysUserId {
 						button.BtnApplyReceive = true
 					} else {
 						button.BtnReceive = true
@@ -1080,7 +1086,7 @@ func GetCompanyPermissionButton(roleTypeCode, status, itemSellerIds, itemGroupId
 					button.BtnRemarkView = true
 					//button.BtnThaw = false
 				} else if productStatus == utils.COMPANY_STATUS_LOSE { //流失
-					if sellerId == sysUserId || groupId == sysUserGroupId || shareSellerId == sysUserId {
+					if sellerId == sysUserId || groupId == sysUserGroupId || utils.InArrayByStr(shareSellerIdArr, strconv.Itoa(sysUserId)) || shareSellerId == sysUserId {
 						button.BtnApplyReceive = true
 					} else {
 						button.BtnReceive = true
@@ -1140,13 +1146,13 @@ func GetCompanyPermissionButton(roleTypeCode, status, itemSellerIds, itemGroupId
 
 			//如果是自己客户，那么拥有查看权限
 			if hasSellerId {
-				if sellerId == sysUserId {
+				if sellerId == sysUserId ||utils.InArrayByStr(shareSellerIdArr, strconv.Itoa(sysUserId)) || shareSellerId == sysUserId {
 					button.BtnView = true                             //显示权限、详情
 					if productStatus == utils.COMPANY_STATUS_FORMAL { //正式
 						button.BtnUpdate = true
 						button.BtnTryOut = true
 						button.BtnModifySeller = true
-						button.BtnShare = true
+						//button.BtnShare = true
 						button.BtnRemarkEdit = true
 						button.BtnRemarkView = true
 					} else if productStatus == utils.COMPANY_STATUS_TRY_OUT { //试用
@@ -1159,6 +1165,7 @@ func GetCompanyPermissionButton(roleTypeCode, status, itemSellerIds, itemGroupId
 						button.BtnFreeze = true
 						button.BtnRemarkEdit = true
 						button.BtnRemarkView = true
+						//button.BtnShare = true
 					} else if productStatus == utils.COMPANY_STATUS_FREEZE { //冻结
 						button.BtnThaw = true
 						button.BtnModifySeller = true
@@ -1168,6 +1175,7 @@ func GetCompanyPermissionButton(roleTypeCode, status, itemSellerIds, itemGroupId
 						button.BtnApplyReceive = true
 					} else { //永续
 						//button.BtnDelete = true
+
 					}
 				} else {
 					if productStatus == utils.COMPANY_STATUS_LOSE { //流失
@@ -1187,16 +1195,17 @@ func GetCompanyPermissionButton(roleTypeCode, status, itemSellerIds, itemGroupId
 				button.BtnView = true                             //查看详情权限
 				if productStatus == utils.COMPANY_STATUS_FORMAL { //正式
 					button.BtnModifySeller = true
-					button.BtnShare = true
+					//button.BtnShare = true
 					button.BtnRemarkView = true
 				} else if productStatus == utils.COMPANY_STATUS_TRY_OUT { //试用
 					button.BtnModifySeller = true
 					button.BtnRemarkView = true
+					//button.BtnShare = true
 				} else if productStatus == utils.COMPANY_STATUS_FREEZE { //冻结
 					button.BtnModifySeller = true
 					button.BtnRemarkView = true
 				} else if productStatus == utils.COMPANY_STATUS_LOSE { //流失
-					if sellerId == sysUserId || groupId == sysUserGroupId {
+					if sellerId == sysUserId || groupId == sysUserGroupId ||utils.InArrayByStr(shareSellerIdArr, strconv.Itoa(sysUserId)) || shareSellerId == sysUserId {
 						button.BtnApplyReceive = true
 					} else {
 						button.BtnReceive = true
@@ -2370,7 +2379,7 @@ func FilterReadAndContractAuth(chartPermissions, contractPermissions, condition
 	return
 }
 
-// GetShareCompanyPermissionButton 正式客户共享-权限按钮(目前仅FICC有正式客户共享, 所以不管权益角色)
+// GetShareCompanyPermissionButton 正式客户共享-权限按钮
 func GetShareCompanyPermissionButton(roleTypeCode, statuses string, productId int, item *company.CompanyItem, sysUser *system.Admin) (button *company.ButtonPermission) {
 	statusMap := make(map[int]string)
 	statusMap[productId] = statuses
@@ -2405,25 +2414,29 @@ func GetShareCompanyPermissionButton(roleTypeCode, statuses string, productId in
 	button.BtnView = true
 
 	// 超管, FICC管理员
-	if roleTypeCode == utils.ROLE_TYPE_CODE_ADMIN || roleTypeCode == utils.ROLE_TYPE_CODE_FICC_ADMIN {
+	if roleTypeCode == utils.ROLE_TYPE_CODE_ADMIN || roleTypeCode == utils.ROLE_TYPE_CODE_FICC_ADMIN || roleTypeCode == utils.ROLE_TYPE_CODE_RAI_ADMIN {
 		button.BtnModifySeller = true
 		button.BtnRemarkView = true
 		button.BtnServiceRecord = true
 	}
-	status, ok := statusMap[1]
-	if !ok {
-		return
+	if roleTypeCode == utils.ROLE_TYPE_CODE_ADMIN {
+		button.BtnModifySeller = false
 	}
+	status, _ := statusMap[1]
+	//if !ok {
+	//	return
+	//}
 	// 客户非关闭状态可见沟通记录按钮
 	if status != utils.COMPANY_STATUS_CLOSE {
 		button.BtnServiceRecord = true
 	}
 
-	// ficc销售
-	ficcArr := []string{
+	// 销售
+	sellerArr := []string{
 		utils.ROLE_TYPE_CODE_FICC_GROUP, utils.ROLE_TYPE_CODE_FICC_TEAM, utils.ROLE_TYPE_CODE_FICC_SELLER,
+		utils.ROLE_TYPE_CODE_RAI_GROUP,utils.ROLE_TYPE_CODE_RAI_SELLER,utils.ROLE_TYPE_CODE_RAI_ADMIN,
 	}
-	if !utils.InArrayByStr(ficcArr, roleTypeCode) {
+	if !utils.InArrayByStr(sellerArr, roleTypeCode) {
 		return
 	}
 	if status == utils.COMPANY_STATUS_TRY_OUT {
@@ -2440,7 +2453,7 @@ func GetShareCompanyPermissionButton(roleTypeCode, statuses string, productId in
 		button.BtnRemarkView = true
 		button.BtnServiceRecord = true
 	}
-	companyButton := GetCompanyPermissionButton(roleTypeCode, statuses, item.SellerIds, item.GroupIds, item.GroupId, sysUser.GroupId, item.SellerId, sysUser.AdminId, sysUser.Authority, item.ProductId, item.ShareSellerId)
+	companyButton := GetCompanyPermissionButton(roleTypeCode, statuses, item.SellerIds, item.GroupIds, item.GroupId, sysUser.GroupId, item.SellerId, sysUser.AdminId, sysUser.Authority, item.ProductId, -1, item.ShareSellerIds)
 	if companyButton.BtnShare == true {
 		button.BtnShare = true
 	}

services/company_permission.go

@@ -378,3 +378,44 @@ func GetPermissionNameMap() (mapItem map[int]string, err error) {
 	mapItem = mapPermissionName
 	return
 }
+
+func GetBasePermissionLookItem(productId int) (allPermissions []*company.PermissionLookItem, permissionMap map[int][]*company.PermissionLookItem, err error) {
+	//子权限切片集合
+	allPermissions, err = company.GetPermissionLookItemsByProductId(productId)
+	if err != nil {
+		err = fmt.Errorf("获取权限失败，Err:%s", err.Error())
+		return
+	}
+	permissionMap = make(map[int][]*company.PermissionLookItem, 0)
+	for _, v := range allPermissions {
+		if v.ParentId > 0 {
+			permissionMap[v.ParentId] = append(permissionMap[v.ParentId], v)
+		}
+	}
+	return
+}
+
+func GetBaseFiccPermissionSetItem() (allPermissions []*company.PermissionSetItem, permissionMap map[int][]*company.PermissionSetItem, err error) {
+	//子权限切片集合
+	allPermissions, err = company.GetPermissionByProductId(utils.COMPANY_PRODUCT_FICC_ID)
+	if err != nil {
+		err = fmt.Errorf("获取权限失败，Err:%s", err.Error())
+		return
+	}
+	permissionMap = make(map[int][]*company.PermissionSetItem, 0)
+	for _, v := range allPermissions {
+		if v.ParentId > 0 {
+			permissionMap[v.ParentId] = append(permissionMap[v.ParentId], v)
+		}
+	}
+	return
+}
+
+func GetPermissionFirstArr(productId int) (list []*models.ChartPermission, err error) {
+	if productId == 0 {
+		list, err = models.GetPermissionFirst()
+	} else {
+		list, err = models.GetPermissionFirstByProductId(productId)
+	}
+	return
+}

services/contract/contract.go

@@ -1167,52 +1167,41 @@ func GetPermissionByContractService(productId int, serviceList []*contract.Contr
 // GetPermissionByPermissionIdMap 通过权限id的map，获取权限列表
 func GetPermissionByPermissionIdMap(productId int, checkPermissionIdMap map[int]int) (permissionList []*company.PermissionLookList, err error) {
 	//子权限切片集合
-	var permissionClassifyArr []string
-	if productId == 1 {
-		for _, v := range utils.PermissionFiccClassifyArr {
-			permissionClassifyArr = append(permissionClassifyArr, v)
+	allPermissions, err := company.GetPermissionLookItemsByProductId(productId)
+	if err != nil {
+		err = fmt.Errorf("获取权限失败，Err:%s", err.Error())
+		return
+	}
+	permissionMap := make(map[int][]*company.PermissionLookItem, 0)
+	for _, v := range allPermissions {
+		if v.ParentId > 0 {
+			permissionMap[v.ParentId] = append(permissionMap[v.ParentId], v)
 		}
-	} else {
-		permissionClassifyArr = append(permissionClassifyArr, "权益")
 	}
-
 	//遍历获取
-	for _, v := range permissionClassifyArr {
-		checkList := make([]int, 0)
-		plist := new(company.PermissionLookList)
-		items, tmpErr := company.GetPermissionLookItems(productId, v)
-		if tmpErr != nil {
-			err = tmpErr
-			return
-		}
-		for _, n := range items {
-			if _, ok := checkPermissionIdMap[n.ChartPermissionId]; ok {
-				checkList = append(checkList, n.ChartPermissionId)
-			} else if _, ok2 := checkPermissionIdMap[n.ChartPermissionId+utils.PERMISSION_ID_UPGRADE]; ok2 {
-				checkList = append(checkList, n.ChartPermissionId)
-				n.IsUpgrade = 1
+	for _, v := range allPermissions {
+		if v.ParentId == 0 {
+			checkList := make([]int, 0)
+			plist := new(company.PermissionLookList)
+			plist.Items = make([]*company.PermissionLookItem, 0)
+			items, ok1 := permissionMap[v.ChartPermissionId]
+			if ok1 {
+				for _, n := range items {
+					if _, ok := checkPermissionIdMap[n.ChartPermissionId]; ok {
+						checkList = append(checkList, n.ChartPermissionId)
+					} else if _, ok2 := checkPermissionIdMap[n.ChartPermissionId+utils.PERMISSION_ID_UPGRADE]; ok2 {
+						checkList = append(checkList, n.ChartPermissionId)
+						n.IsUpgrade = 1
+					}
+				}
+				plist.Items = items
 			}
+			plist.ClassifyName = v.PermissionName
+			plist.CheckList = checkList
+
+			permissionList = append(permissionList, plist)
 		}
-		//sandoPermissionIdMap := make(map[string]int)
-		////权益客户下，主观客观同时选择，进行合并
-		//for _, n := range items {
-		//	if _, ok := checkPermissionIdMap[n.ChartPermissionId]; ok {
-		//		if sandoPermissionIdMap[n.PermissionName] == 0 {
-		//			checkList = append(checkList, n.ChartPermissionId)
-		//		}
-		//		sandoPermissionIdMap[n.PermissionName] += 1
-		//	}
-		//}
-		//for i, n := range items {
-		//	if sandoPermissionIdMap[n.PermissionName] == 1 {
-		//		items[i].PermissionName = n.Remark
-		//	}
-		//}
-		plist.Items = items
-		plist.ClassifyName = v
-		plist.CheckList = checkList
 
-		permissionList = append(permissionList, plist)
 	}
 	return
 }
@@ -1235,18 +1224,29 @@ func GetServicePermissionMap(serviceList []*contract.ContractServiceAndDetail) (
 		}
 		switch contractService.ServiceTemplateId {
 		case 1: //ficc 大套餐
-			for _, v := range utils.PermissionFiccClassifyArr {
-				//大套餐中 市场策略暂时不作为勾选项
-				if v == "市场策略" {
-					continue
-				}
-				items, tmpErr := company.GetPermissionLookItems(1, v)
-				if tmpErr != nil {
-					err = tmpErr
-					return
+			allFiccPermissions, e := company.GetPermissionLookItemsByProductId(utils.COMPANY_PRODUCT_FICC_ID)
+			if e != nil {
+				err = fmt.Errorf("获取权限失败 Err：%v", e)
+				return
+			}
+			permissionMap := make(map[int][]*company.PermissionLookItem, 0)
+			for _, v := range allFiccPermissions {
+				if v.ParentId > 0 {
+					permissionMap[v.ParentId] = append(permissionMap[v.ParentId], v)
 				}
-				for _, n := range items {
-					checkPermissionIdMap[n.ChartPermissionId] = n.ChartPermissionId
+			}
+			for _, v := range allFiccPermissions {
+				if v.ParentId == 0 {
+					//合同这边市场策略不需要体现出来，所以调整返回
+					if v.PermissionName == "市场策略" {
+						continue
+					}
+					items, ok := permissionMap[v.ChartPermissionId]
+					if ok {
+						for _, n := range items {
+							checkPermissionIdMap[n.ChartPermissionId] = n.ChartPermissionId
+						}
+					}
 				}
 			}
 		case 2: //ficc小套餐

services/crm_eta.go

@@ -3,6 +3,7 @@ package services
 import (
 	"encoding/json"
 	"fmt"
+	"hongze/hz_crm_api/services/alarm_msg"
 	"hongze/hz_crm_api/utils"
 	"io/ioutil"
 	"net/http"
@@ -178,3 +179,79 @@ func CodeLoginFromMiddleServer(authCode string) (tokenResp GetEtaTokenData, err
 	tokenResp = result.Data
 	return
 }
+
+// EtaTrialManualUserAddAuthReq 体验版用户添加手工权限
+type EtaTrialManualUserAddAuthReq struct {
+	AdminId   int    `json:"admin_id" description:"用户ID"`
+	AdminName string `json:"admin_name" description:"用户名"`
+}
+
+// EtaTrialManualUserAddAuth CRM_ETA服务-体验版用户添加手工权限
+func EtaTrialManualUserAddAuth(adminId int, adminName string) (err error) {
+	// 体验版无测试环境
+	//if utils.RunMode != "release" {
+	//	return
+	//}
+	defer func() {
+		if err != nil {
+			alarm_msg.SendAlarmMsg(fmt.Sprintf("EtaTrialManualUserAddAuth, 新增试用客户手工录入权限失败, ErrMsg: %s", err.Error()), 3)
+		}
+	}()
+
+	url := fmt.Sprint(utils.CrmEtaServerUrl, "/api/eta_trial/manual_user/add_auth")
+	param := EtaTrialManualUserAddAuthReq{
+		AdminId:   adminId,
+		AdminName: adminName,
+	}
+	data, e := json.Marshal(param)
+	if e != nil {
+		err = fmt.Errorf("data json marshal err: %s", e.Error())
+		return
+	}
+
+	body := ioutil.NopCloser(strings.NewReader(string(data)))
+	client := &http.Client{}
+	req, e := http.NewRequest("POST", url, body)
+	if e != nil {
+		err = fmt.Errorf("http create request err: %s", e.Error())
+		return
+	}
+
+	contentType := "application/json;charset=utf-8"
+	req.Header.Set("Content-Type", contentType)
+	req.Header.Set("Authorization", utils.CrmEtaAuthorization)
+	resp, e := client.Do(req)
+	if e != nil {
+		err = fmt.Errorf("http client do err: %s", e.Error())
+		return
+	}
+	defer func() {
+		_ = resp.Body.Close()
+	}()
+	b, e := ioutil.ReadAll(resp.Body)
+	if e != nil {
+		err = fmt.Errorf("resp body read err: %s", e.Error())
+		return
+	}
+	if len(b) == 0 {
+		err = fmt.Errorf("resp body is empty")
+		return
+	}
+	// 生产环境解密, 注意有个坑前后的双引号
+	if utils.RunMode == "release" {
+		str := string(b)
+		str = strings.Trim(str, `"`)
+		b = utils.DesBase64Decrypt([]byte(str))
+	}
+
+	result := new(MiddleServerResultData)
+	if e = json.Unmarshal(b, &result); e != nil {
+		err = fmt.Errorf("result unmarshal err: %s\nresult: %s", e.Error(), string(b))
+		return
+	}
+	if result.Code != 200 {
+		err = fmt.Errorf("result: %s", string(b))
+		return
+	}
+	return
+}

services/cygx/activity_poster.go

@@ -328,3 +328,80 @@ func MakeCygxMp4HtmlImg(videoDuration string) (imgUrl string, err error) {
 	imgUrl = res.Data
 	return
 }
+
+//func init() {
+//	//MakeActivityMomentsImg(2850)
+//	var condition string
+//	var pars []interface{}
+//	condition = " AND   chart_permission_id  = 31  AND  publish_status   = 1   AND active_state  = 1  ORDER BY  activity_id DESC   "
+//	list, errList := cygx.GetActivityListAll(condition, pars, 0, 9999)
+//	if errList != nil {
+//		fmt.Println(errList)
+//		return
+//	}
+//	fmt.Println("list", len(list))
+//
+//	//return
+//	for _, v := range list {
+//		MakeActivityMomentsImg(v.ActivityId)
+//	}
+//
+//}
+
+// 生成活动分享到朋友圈的图片
+func MakeActivityMomentsImg(activityId int) {
+	var err error
+	//time.Sleep(3*time.Second) // 有时候同时添加多个活动，延迟三秒
+	defer func() {
+		if err != nil {
+			fmt.Println("err：", err)
+			go alarm_msg.SendAlarmMsg("生成活动分享到朋友圈的图片失败，MakeActivityMomentsImg Err："+err.Error()+"活动ID"+strconv.Itoa(activityId), 3)
+		}
+	}()
+	detail, e := cygx.GetAddActivityInfoById(activityId)
+	if e != nil {
+		err = errors.New("GetCygxReportSelectionInfoById, Err: " + e.Error())
+		return
+	}
+
+	// 不是研选活动不生成图片
+	if detail.ChartPermissionId != utils.CHART_PERMISSION_ID_YANXUAN {
+		return
+	}
+	var configCode string
+	if detail.IsResearchPoints == 1 {
+		configCode = "activity_moments_img_points_html" // 扣点活动
+	} else {
+		configCode = "activity_moments_img_html" // 非扣点活动
+	}
+
+	detailConfig, e := cygx.GetCygxConfigDetailByCode(configCode)
+	if e != nil {
+		err = errors.New("GetCygxConfigDetailByCode 获取生成活动分享到朋友圈的图片格式信息失败, Err: " + e.Error())
+		return
+	}
+	configValue := detailConfig.ConfigValue
+	configValue = strings.Replace(configValue, "{{Title}}", detail.ActivityName, -1)
+	configValue = strings.Replace(configValue, "{{ActivityTypeName}}", detail.ActivityTypeName, -1)
+	configValue = strings.Replace(configValue, "{{Label}}", detail.Label, -1)
+	configValue = strings.Replace(configValue, "{{ActivityTimeText}}", detail.ActivityTimeText, -1)
+	htm2ImgReq := make(map[string]interface{})
+	htm2ImgReq["html_content"] = configValue
+	htm2ImgReq["width"] = 2250
+	htm2ImgReq["height"] = 3813
+	res, err := postHtml2Img(htm2ImgReq)
+	if err != nil || res == nil {
+		err = errors.New("html转图片失败: " + res.Msg)
+		return
+	}
+	if res.Code != 200 {
+		err = errors.New("html转图片失败: " + res.Msg)
+		return
+	}
+	imgUrl := res.Data
+	// 记录海报信息
+	err = cygx.UpdateCygxActivityMomentsImg(imgUrl, activityId)
+	if err != nil {
+		return
+	}
+}

services/cygx/research_summary.go

@@ -1,6 +1,7 @@
 package cygx
 
 import (
+	"errors"
 	"fmt"
 	"hongze/hz_crm_api/models"
 	"hongze/hz_crm_api/models/cygx"
@@ -583,3 +584,72 @@ func DoXzsChooseSend(chartPermissionName string) string {
 	}
 	return allIn
 }
+
+//func init() {
+//	//MakeArticleMomentsImg(1000408)
+//	var condition string
+//	var pars []interface{}
+//	condition = " AND   article_type_id  > 0   AND  publish_status   = 1   ORDER BY  article_id  DESC "
+//	list, errList := cygx.GetCygxArticleList(condition, pars, 0, 999)
+//	if errList != nil {
+//		fmt.Println(errList)
+//		return
+//	}
+//	fmt.Println("list", len(list))
+//	//return
+//	for k, v := range list {
+//		fmt.Println(k)
+//		MakeArticleMomentsImg(v.ArticleId)
+//	}
+//}
+
+// 生成文章分享到朋友圈的图片
+func MakeArticleMomentsImg(articleId int) {
+	var err error
+	//time.Sleep(3*time.Second) // 有时候同时添加多个活动，延迟三秒
+	defer func() {
+		if err != nil {
+			fmt.Println("err：", err)
+			go alarm_msg.SendAlarmMsg("生成文章分享到朋友圈的图片，MakeArticleMomentsImg Err："+err.Error()+"文章ID"+strconv.Itoa(articleId), 3)
+		}
+	}()
+	articleInfo, e := cygx.GetArticleInfoOtherByArticleId(articleId)
+	if e != nil {
+		err = errors.New("GetArticleInfoOtherByArticleId, Err: " + e.Error())
+		return
+	}
+
+	configCode := "article_moments_img_html"
+	detailConfig, e := cygx.GetCygxConfigDetailByCode(configCode)
+	if e != nil {
+		err = errors.New("GetCygxConfigDetailByCode 获取生成文章分享到朋友圈的图片格式信息失败, Err: " + e.Error())
+		return
+	}
+	configValue := detailConfig.ConfigValue
+	configValue = strings.Replace(configValue, "{{Title}}", articleInfo.Title, -1)
+	configValue = strings.Replace(configValue, "{{HeadImgUrl}}", articleInfo.HeadImgUrl, -1)
+	configValue = strings.Replace(configValue, "{{NickName}}", articleInfo.NickName, -1)
+	configValue = strings.Replace(configValue, "{{PublishDate}}", articleInfo.PublishDate.Format(utils.FormatDateTime), -1)
+	configValue = strings.Replace(configValue, "{{Abstract}}", articleInfo.Abstract, -1)
+	configValue = strings.Replace(configValue, "{{BodyText}}", articleInfo.BodyText, -1)
+
+	htm2ImgReq := make(map[string]interface{})
+	htm2ImgReq["html_content"] = configValue
+	htm2ImgReq["width"] = 2250
+	htm2ImgReq["height"] = 3813
+	res, err := postHtml2Img(htm2ImgReq)
+	if err != nil || res == nil {
+		err = errors.New("html转图片失败: " + res.Msg)
+		return
+	}
+	if res.Code != 200 {
+		err = errors.New("html转图片失败: " + res.Msg)
+		return
+	}
+	imgUrl := res.Data
+	//fmt.Println(imgUrl)
+	// 记录海报信息
+	err = cygx.UpdateCygxArticleMomentsImg(imgUrl, articleId)
+	return
+
+}

services/eta_trial.go

@@ -191,7 +191,8 @@ func ApprovalApply(approvalId int) (err error) {
 
 		// 新增试用客户手工权限
 		go func() {
-			_ = CreateTrialUserManualAuth(newId, admin.RealName)
+			//_ = CreateTrialUserManualAuth(newId, admin.RealName)
+			_ = EtaTrialManualUserAddAuth(newId, admin.RealName)
 		}()
 	}
 

services/report_chapter_type_sync.go

@@ -0,0 +1,81 @@
+package services
+
+import (
+	"encoding/json"
+	"fmt"
+	"hongze/hz_crm_api/services/alarm_msg"
+	"hongze/hz_crm_api/utils"
+)
+
+type EditReportChapterTypeSyncReq struct {
+	ReportChapterTypeId int `description:"报告章节类型id"`
+}
+
+func EditReportChapterTypeSync(pars *EditReportChapterTypeSyncReq) (err error, errMsg string) {
+	defer func() {
+		if err != nil {
+			utils.FileLog.Info("同步章节小程序数据失败, Err: " + err.Error() + errMsg)
+			alarm_msg.SendAlarmMsg("同步章节小程序数据失败，Err："+err.Error(), 3)
+		}
+	}()
+	if utils.CrmEtaServerUrl == "" {
+		return
+	}
+	url := fmt.Sprint(utils.CrmEtaServerUrl, "/api/eta/chapter_type/yb/sync")
+	b, err := crmEtaPost(url, pars)
+	if err != nil {
+		errMsg = "更新品种失败"
+		err = fmt.Errorf("url:%s err: %s", url, err.Error())
+		return
+	}
+	result := new(CrmEtaBaseResp)
+	if e := json.Unmarshal(b, &result); e != nil {
+		errMsg = "更新分类失败"
+		err = fmt.Errorf("result unmarshal err: %s\nresult: %s", e.Error(), string(b))
+		return
+	}
+	utils.FileLog.Info("%s", string(b))
+	if result.Code != 200 {
+		err = fmt.Errorf("result: %s, err: %s", string(b), result.ErrMsg)
+		errMsg = result.Msg
+		return
+	}
+	return
+}
+
+type EditReportChapterTypeRuleSyncReq struct {
+	ResearchType string `description:"研报类型"`
+}
+
+// EditReportChapterTypeRuleSync 同步章节更新设置
+func EditReportChapterTypeRuleSync(pars *EditReportChapterTypeRuleSyncReq) (err error, errMsg string) {
+	defer func() {
+		if err != nil {
+			utils.FileLog.Info("同步章节更新设置失败, Err: " + err.Error() + errMsg)
+			alarm_msg.SendAlarmMsg("同步章节更新设置失败，Err："+err.Error(), 3)
+		}
+	}()
+	if utils.CrmEtaServerUrl == "" {
+		return
+	}
+	url := fmt.Sprint(utils.CrmEtaServerUrl, "/api/eta/chapter_type/rule/sync")
+	b, err := crmEtaPost(url, pars)
+	if err != nil {
+		errMsg = "更新品种失败"
+		err = fmt.Errorf("url:%s err: %s", url, err.Error())
+		return
+	}
+	result := new(CrmEtaBaseResp)
+	if e := json.Unmarshal(b, &result); e != nil {
+		errMsg = "更新分类失败"
+		err = fmt.Errorf("result unmarshal err: %s\nresult: %s", e.Error(), string(b))
+		return
+	}
+	utils.FileLog.Info("%s", string(b))
+	if result.Code != 200 {
+		err = fmt.Errorf("result: %s, err: %s", string(b), result.ErrMsg)
+		errMsg = result.Msg
+		return
+	}
+	return
+}

services/roadshow/report.go

@@ -1,7 +1,9 @@
 package roadshow
 
 import (
+	"fmt"
 	"hongze/hz_crm_api/models/company"
+	"hongze/hz_crm_api/models/overseas_custom"
 	"hongze/hz_crm_api/models/roadshow"
 	"hongze/hz_crm_api/utils"
 	"time"
@@ -447,3 +449,497 @@ func getSellerSectionData(startDate, endDate time.Time, dimensionType string) (a
 	}
 	return
 }
+
+type OverseasAdminDataMap struct {
+	TryOutMap  map[int]int `description:"试用路演次数"`
+	FormalMap  map[int]int `description:"正式路演次数"`
+	CloseMap   map[int]int `description:"关闭客户次数"`
+	OnlineMap  map[int]int `description:"线上路演次数"`
+	OfflineMap map[int]int `description:"线上路演次数"`
+	StartDate  string      `description:"开始日期"`
+	EndDate    string      `description:"开始日期"`
+}
+
+// GetOverseasWeekDataV2 周度数据
+func GetOverseasWeekDataV2(adminType, dimensionType string, weekNum int) (adminDataList []OverseasAdminDataMap, firstDate time.Time, err error) {
+	nowWeekMonday := utils.GetNowWeekMonday() //本周周一
+	//fmt.Println(nowWeekMonday)
+	nowWeekSunday := nowWeekMonday.AddDate(0, 0, 7).Add(-1 * time.Second) //本周周日
+	chanList := make([]chan OverseasAdminDataMap, 0)
+	for i := 0; i < weekNum; i++ {
+		tmpCh := make(chan OverseasAdminDataMap, 0)
+		chanList = append(chanList, tmpCh)
+
+		lastWeekMonday := nowWeekMonday.AddDate(0, 0, -7*i)
+		lastWeekSunday := nowWeekSunday.AddDate(0, 0, -7*i)
+
+		// 第一个开始日期
+		firstDate = lastWeekMonday
+		go getOverseasSectionData(lastWeekMonday, lastWeekSunday, adminType, dimensionType, tmpCh)
+	}
+
+	adminDataList = make([]OverseasAdminDataMap, 0)
+	for _, vChan := range chanList {
+		var weekAdminDataMap OverseasAdminDataMap
+		weekAdminDataMap = <-vChan
+		close(vChan)
+		adminDataList = append(adminDataList, weekAdminDataMap)
+	}
+
+	return
+}
+
+// getOverseasSectionData 获取周期数据
+func getOverseasSectionData(startDate, endDate time.Time, adminType, dimensionType string, ch chan OverseasAdminDataMap) (adminDataMap OverseasAdminDataMap, err error) {
+	defer func() {
+		ch <- adminDataMap
+	}()
+	//adminType := `seller`
+	switch adminType {
+	case "researcher":
+		adminDataMap, err = getOverseasResearcherSectionData(startDate, endDate)
+	case "seller":
+		adminDataMap, err = getOverseasSellerSectionData(startDate, endDate, dimensionType)
+	}
+	return
+}
+
+// getOverseasSellerSectionData 获取销售周期数据
+func getOverseasSellerSectionData(startDate, endDate time.Time, dimensionType string) (adminDataMap OverseasAdminDataMap, err error) {
+	tryOutMap := make(map[int]int)
+	formalMap := make(map[int]int)
+	closeMap := make(map[int]int)
+	onlineMap := make(map[int]int)
+	offlineMap := make(map[int]int)
+	//fmt.Println()
+	//客户状态维度
+	companylist, err := overseas_custom.GetOverseasCustomList("", nil)
+	if err != nil {
+		return
+	}
+	formalIdsArr := make([]int, 0)
+	tryoutIdsArr := make([]int, 0)
+	closeIdsArr := make([]int, 0)
+	for _, v := range companylist {
+		if v.OverseasStatus == "正式" {
+			formalIdsArr = append(formalIdsArr, v.CompanyId)
+		} else if v.OverseasStatus == "试用" {
+			tryoutIdsArr = append(tryoutIdsArr, v.CompanyId)
+		} else if v.OverseasStatus == "关闭" {
+			closeIdsArr = append(closeIdsArr, v.CompanyId)
+		}
+	}
+	if dimensionType == "company_status" {
+		//正式客户
+		{
+			//var condition string
+			//var pars []interface{}
+			//condition = ` and start_date >= ? and end_date <= ?  and company_status = ? and company_id IN (` + utils.GetOrmInReplace(len(formalIdsArr)) + `)`
+			//pars = append(pars, startDate, endDate, "正式", formalIdsArr)
+			data, tmpErr := roadshow.GetOverseasGroupSellerRecordList(startDate.Format(utils.FormatDate), endDate.Format(utils.FormatDate), "正式")
+			if tmpErr != nil {
+				err = tmpErr
+				return
+			}
+			for _, v := range data {
+				fmt.Println(v)
+				formalMap[v.AdminId] = v.Num
+			}
+		}
+
+		//试用客户
+		{
+			//var condition string
+			//var pars []interface{}
+			//condition = ` and start_date >= ? and end_date <= ? and company_status = ? and company_id IN (` + utils.GetOrmInReplace(len(tryoutIdsArr)) + `)`
+			//pars = append(pars, startDate, endDate, "试用", tryoutIdsArr)
+			data, tmpErr := roadshow.GetOverseasGroupSellerRecordList(startDate.Format(utils.FormatDate), endDate.Format(utils.FormatDate), "试用")
+
+			if tmpErr != nil {
+				err = tmpErr
+				return
+			}
+			for _, v := range data {
+				//fmt.Println(v)
+				tryOutMap[v.AdminId] = v.Num
+			}
+		}
+
+		//关闭客户
+		{
+			//var condition string
+			//var pars []interface{}
+			//condition = ` and start_date >= ? and end_date <= ? and company_status = ? and company_id IN (` + utils.GetOrmInReplace(len(closeIdsArr)) + `)`
+			//pars = append(pars, startDate, endDate, "关闭", closeIdsArr)
+			data, tmpErr := roadshow.GetOverseasGroupSellerRecordList(startDate.Format(utils.FormatDate), endDate.Format(utils.FormatDate), "关闭")
+
+			if tmpErr != nil {
+				err = tmpErr
+				return
+			}
+			for _, v := range data {
+				//fmt.Println(v)
+				closeMap[v.AdminId] = v.Num
+			}
+		}
+	}
+
+	//路演形式维度
+	//if dimensionType == "roadshow_type" {
+	//	//线上路演
+	//	{
+	//		var condition string
+	//		var pars []interface{}
+	//		condition = ` and start_date >= ? and end_date <= ? and roadshow_type = ? and company_id IN (` + utils.GetOrmInReplace(len(idsArr)) + `)`
+	//		pars = append(pars, startDate, endDate, "线上", idsArr)
+	//		data, tmpErr := roadshow.GetOverseasGroupSellerRecordList(condition, pars)
+	//		if tmpErr != nil {
+	//			err = tmpErr
+	//			return
+	//		}
+	//		for _, v := range data {
+	//			//fmt.Println(v)
+	//			onlineMap[v.AdminId] = v.Num
+	//		}
+	//	}
+	//
+	//	//线下路演
+	//	{
+	//		var condition string
+	//		var pars []interface{}
+	//		condition = ` and start_date >= ? and end_date <= ? and roadshow_type = ? and company_id IN (` + utils.GetOrmInReplace(len(idsArr)) + `)`
+	//		pars = append(pars, startDate, endDate, "线下", idsArr)
+	//		data, tmpErr := roadshow.GetOverseasGroupSellerRecordList(condition, pars)
+	//		if tmpErr != nil {
+	//			err = tmpErr
+	//			return
+	//		}
+	//		for _, v := range data {
+	//			//fmt.Println(v)
+	//			offlineMap[v.AdminId] = v.Num
+	//		}
+	//	}
+	//}
+
+	////销售专项路演统计
+	//if dimensionType == "seller_special" {
+	//
+	//	detail, errdetail := company.GetConfigDetailByCode("choice_researcher_adminid")
+	//	if errdetail != nil {
+	//		err = errdetail
+	//		return
+	//	}
+	//	//正式客户
+	//	{
+	//		var condition string
+	//		var pars []interface{}
+	//		condition = ` and start_date >= ? and end_date <= ?  and company_status = ? ` + ` and researcher_id IN (` + detail.ConfigValue + `) `
+	//		pars = append(pars, startDate, endDate, "正式")
+	//		data, tmpErr := roadshow.GetOverseasGroupSellerRecordList(condition, pars)
+	//		if tmpErr != nil {
+	//			err = tmpErr
+	//			return
+	//		}
+	//		for _, v := range data {
+	//			formalMap[v.AdminId] = v.Num
+	//		}
+	//	}
+	//
+	//	//试用客户
+	//	{
+	//		var condition string
+	//		var pars []interface{}
+	//		condition = ` and start_date >= ? and end_date <= ? and company_status = ? ` + ` and researcher_id IN (` + detail.ConfigValue + `) `
+	//		pars = append(pars, startDate, endDate, "试用")
+	//		data, tmpErr := roadshow.GetOverseasGroupSellerRecordList(condition, pars)
+	//
+	//		if tmpErr != nil {
+	//			err = tmpErr
+	//			return
+	//		}
+	//		for _, v := range data {
+	//			//fmt.Println(v)
+	//			tryOutMap[v.AdminId] = v.Num
+	//		}
+	//	}
+	//
+	//	//公开会议
+	//	{
+	//		var condition string
+	//		var pars []interface{}
+	//		condition = ` and start_date >= ? and end_date <= ? and activity_type = ? ` + ` and researcher_id IN (` + detail.ConfigValue + `) `
+	//		pars = append(pars, startDate, endDate, "公开会议")
+	//		data, tmpErr := roadshow.GetOverseasGroupSellerRecordList(condition, pars)
+	//		if tmpErr != nil {
+	//			err = tmpErr
+	//			return
+	//		}
+	//		for _, v := range data {
+	//			//fmt.Println(v)
+	//			meetingMap[v.AdminId] = v.Num
+	//		}
+	//	}
+	//} else {
+	//	//公开会议
+	//	{
+	//		var condition string
+	//		var pars []interface{}
+	//		condition = ` and start_date >= ? and end_date <= ? and activity_type = ? `
+	//		pars = append(pars, startDate, endDate, "公开会议")
+	//		data, tmpErr := roadshow.GetOverseasGroupSellerRecordList(condition, pars)
+	//		if tmpErr != nil {
+	//			err = tmpErr
+	//			return
+	//		}
+	//		for _, v := range data {
+	//			//fmt.Println(v)
+	//			meetingMap[v.AdminId] = v.Num
+	//		}
+	//	}
+	//}
+
+	adminDataMap = OverseasAdminDataMap{
+		TryOutMap:  tryOutMap,
+		FormalMap:  formalMap,
+		CloseMap:   closeMap,
+		OfflineMap: offlineMap,
+		OnlineMap:  onlineMap,
+		StartDate:  startDate.Format(utils.FormatDate),
+		EndDate:    endDate.Format(utils.FormatDate),
+	}
+	return
+}
+
+// getOverseasResearcherSectionData 获取研究员周期数据
+func getOverseasResearcherSectionData(startDate, endDate time.Time) (adminDataMap OverseasAdminDataMap, err error) {
+	tryOutMap := make(map[int]int)
+	formalMap := make(map[int]int)
+	closemap := make(map[int]int)
+
+	//companylist, err := overseas_custom.GetOverseasCustomList("", nil)
+	//if err != nil {
+	//	return
+	//}
+	//formalIdsArr := make([]int, 0)
+	//tryoutIdsArr := make([]int, 0)
+	//closeIdsArr := make([]int, 0)
+	//for _, v := range companylist {
+	//	if v.OverseasStatus == "正式" {
+	//		formalIdsArr = append(formalIdsArr, v.CompanyId)
+	//	} else if v.OverseasStatus == "试用" {
+	//		tryoutIdsArr = append(tryoutIdsArr, v.CompanyId)
+	//	} else if v.OverseasStatus == "关闭" {
+	//		closeIdsArr = append(closeIdsArr, v.CompanyId)
+	//	}
+	//}
+	//正式客户
+	{
+		//var condition string
+		//var pars []interface{}
+		//condition = ` and start_date >= ? and end_date <= ?  and company_status = ? and company_id IN (` + utils.GetOrmInReplace(len(formalIdsArr)) + `)`
+		//pars = append(pars, startDate, endDate, "正式", formalIdsArr)
+		data, tmpErr := roadshow.GetOverseasGroupResearcherRecordList(startDate.Format(utils.FormatDate), endDate.Format(utils.FormatDate), "正式")
+		if tmpErr != nil {
+			err = tmpErr
+			return
+		}
+		for _, v := range data {
+			formalMap[v.AdminId] = v.Num
+		}
+	}
+
+	//试用客户
+	{
+		//var condition string
+		//var pars []interface{}
+		//condition = ` and start_date >= ? and end_date <= ? and company_status = ? and company_id IN (` + utils.GetOrmInReplace(len(tryoutIdsArr)) + `)`
+		//pars = append(pars, startDate, endDate, "试用", tryoutIdsArr)
+		data, tmpErr := roadshow.GetOverseasGroupResearcherRecordList(startDate.Format(utils.FormatDate), endDate.Format(utils.FormatDate), "试用")
+
+		if tmpErr != nil {
+			err = tmpErr
+			return
+		}
+		for _, v := range data {
+			//fmt.Println(v)
+			tryOutMap[v.AdminId] = v.Num
+		}
+	}
+
+	//试用客户
+	{
+		//var condition string
+		//var pars []interface{}
+		//condition = ` and start_date >= ? and end_date <= ? and company_status = ? and company_id IN (` + utils.GetOrmInReplace(len(closeIdsArr)) + `)`
+		//pars = append(pars, startDate, endDate, "关闭", closeIdsArr)
+		data, tmpErr := roadshow.GetOverseasGroupResearcherRecordList(startDate.Format(utils.FormatDate), endDate.Format(utils.FormatDate), "关闭")
+		if tmpErr != nil {
+			err = tmpErr
+			return
+		}
+		for _, v := range data {
+			//fmt.Println(v)
+			closemap[v.AdminId] = v.Num
+		}
+	}
+
+	adminDataMap = OverseasAdminDataMap{
+		TryOutMap: tryOutMap,
+		FormalMap: formalMap,
+		CloseMap:  closemap,
+		StartDate: startDate.Format(utils.FormatDate),
+		EndDate:   endDate.Format(utils.FormatDate),
+	}
+	return
+}
+
+// GetOverseasMonthDataV2 月度数据
+func GetOverseasMonthDataV2(adminType, dimensionType string, dataNum int) (adminDataMapList []OverseasAdminDataMap, firstDate time.Time, err error) { //三个协程返回
+	nowMonthFirstDay := utils.GetNowMonthFirstDay() //本月第一天
+	//nowMonthLastDay := nowMonthFirstDay.AddDate(0, 1, 0).Add(-1 * time.Second) //本月最后一天
+
+	chanList := make([]chan OverseasAdminDataMap, 0)
+	for i := 0; i < dataNum; i++ {
+		tmpCh := make(chan OverseasAdminDataMap, 0)
+		chanList = append(chanList, tmpCh)
+
+		lastMonthFirstDay := nowMonthFirstDay.AddDate(0, -1*i, 0)                          //上个月第一天
+		lastMonthLastDay := nowMonthFirstDay.AddDate(0, -1*(i-1), 0).Add(-1 * time.Second) //上个月最后一天
+
+		// 第一个开始日期
+		firstDate = lastMonthFirstDay
+		go getOverseasSectionData(lastMonthFirstDay, lastMonthLastDay, adminType, dimensionType, tmpCh)
+	}
+
+	adminDataMapList = make([]OverseasAdminDataMap, 0)
+	for _, vChan := range chanList {
+		var monthAdminDataMap OverseasAdminDataMap
+		monthAdminDataMap = <-vChan
+		close(vChan)
+		adminDataMapList = append(adminDataMapList, monthAdminDataMap)
+	}
+
+	return
+}
+
+// GetOverseasTimeIntervalData 区间数据
+func GetOverseasTimeIntervalData(startDate, endDate, adminType, dimensionType string) (adminDataMapList []OverseasAdminDataMap, firstDate time.Time, err error) { //三个协程返回
+	startDateTimer, _ := time.ParseInLocation(utils.FormatDate, startDate, time.Local)
+	endDateTimer, _ := time.ParseInLocation(utils.FormatDate, endDate, time.Local)
+	endDateTimer = endDateTimer.AddDate(0, 0, 1).Add(-1 * time.Second) //本月最后一天
+
+	//最早的一天
+	firstDate = startDateTimer
+
+	ch1 := make(chan OverseasAdminDataMap, 0)
+
+	go getOverseasSectionData(startDateTimer, endDateTimer, adminType, dimensionType, ch1)
+
+	var adminDataMap OverseasAdminDataMap
+
+	adminDataMap = <-ch1
+	close(ch1)
+
+	adminDataMapList = make([]OverseasAdminDataMap, 0)
+	adminDataMapList = append(adminDataMapList, adminDataMap)
+	return
+}
+
+// GetOverseasWeekData 周度数据
+func GetOverseasWeekData(adminType, dimensionType string) (adminDataList []OverseasAdminDataMap, firstDate time.Time, err error) {
+	nowWeekMonday := utils.GetNowWeekMonday() //本周周一
+	//fmt.Println(nowWeekMonday)
+	nowWeekSunday := nowWeekMonday.AddDate(0, 0, 7).Add(-1 * time.Second) //本周周日
+	//fmt.Println(nowWeekSunday)
+
+	//nowWeekMonday = nowWeekMonday.AddDate(0, 0, -30) //上周周一
+	//nowWeekSunday = nowWeekSunday.AddDate(0, 0, -30) //上周周日
+
+	//adminDataMap, err := getSectionData(nowWeekMonday, nowWeekSunday)
+	//if err != nil {
+	//	fmt.Println(err)
+	//	return
+	//}
+	//fmt.Println(adminDataMap)
+
+	lastWeekMonday := nowWeekMonday.AddDate(0, 0, -7) //上周周一
+	//fmt.Println(lastWeekMonday)
+	//最早的一天
+	firstDate = lastWeekMonday
+	lastWeekSunday := nowWeekSunday.AddDate(0, 0, -7) //上周周日
+	//fmt.Println(lastWeekSunday)
+
+	nextWeekMonday := nowWeekMonday.AddDate(0, 0, 7) //下周周一
+	//fmt.Println(nextWeekMonday)
+	nextWeekSunday := nowWeekSunday.AddDate(0, 0, 7) //下周周日
+	//fmt.Println(nextWeekSunday)
+
+	ch1 := make(chan OverseasAdminDataMap, 0)
+	ch2 := make(chan OverseasAdminDataMap, 0)
+	ch3 := make(chan OverseasAdminDataMap, 0)
+
+	go getOverseasSectionData(lastWeekMonday, lastWeekSunday, adminType, dimensionType, ch1)
+	go getOverseasSectionData(nowWeekMonday, nowWeekSunday, adminType, dimensionType, ch2)
+	go getOverseasSectionData(nextWeekMonday, nextWeekSunday, adminType, dimensionType, ch3)
+
+	var nowWeekAdminDataMap, lastWeekAdminDataMap, nextWeekAdminDataMap OverseasAdminDataMap
+
+	lastWeekAdminDataMap = <-ch1
+	close(ch1)
+
+	nowWeekAdminDataMap = <-ch2
+	close(ch2)
+
+	nextWeekAdminDataMap = <-ch3
+	close(ch3)
+
+	adminDataList = make([]OverseasAdminDataMap, 0)
+	adminDataList = append(adminDataList, lastWeekAdminDataMap, nowWeekAdminDataMap, nextWeekAdminDataMap)
+	return
+}
+
+// GetOverseasMonthData 月度数据
+func GetOverseasMonthData(adminType, dimensionType string) (adminDataMapList []OverseasAdminDataMap, firstDate time.Time, err error) { //三个协程返回
+	nowMonthFirstDay := utils.GetNowMonthFirstDay()                            //本月第一天
+	nowMonthLastDay := nowMonthFirstDay.AddDate(0, 1, 0).Add(-1 * time.Second) //本月最后一天
+
+	lastMonthFirstDay1 := nowMonthFirstDay.AddDate(0, -1, 0)                       //上个月第一天
+	lastMonthLastDay1 := lastMonthFirstDay1.AddDate(0, 1, 0).Add(-1 * time.Second) //上个月最后一天
+
+	lastMonthFirstDay2 := nowMonthFirstDay.AddDate(0, -2, 0)                       //上上个月第一天
+	lastMonthLastDay2 := lastMonthFirstDay2.AddDate(0, 1, 0).Add(-1 * time.Second) //上上个月最后一天
+
+	lastMonthFirstDay3 := nowMonthFirstDay.AddDate(0, -3, 0)                       //上上上个月第一天
+	lastMonthLastDay3 := lastMonthFirstDay3.AddDate(0, 1, 0).Add(-1 * time.Second) //上上上个月最后一天
+
+	//最早的一天
+	firstDate = lastMonthFirstDay3
+
+	ch1 := make(chan OverseasAdminDataMap, 0)
+	ch2 := make(chan OverseasAdminDataMap, 0)
+	ch3 := make(chan OverseasAdminDataMap, 0)
+	ch4 := make(chan OverseasAdminDataMap, 0)
+
+	go getOverseasSectionData(nowMonthFirstDay, nowMonthLastDay, adminType, dimensionType, ch1)
+	go getOverseasSectionData(lastMonthFirstDay1, lastMonthLastDay1, adminType, dimensionType, ch2)
+	go getOverseasSectionData(lastMonthFirstDay2, lastMonthLastDay2, adminType, dimensionType, ch3)
+	go getOverseasSectionData(lastMonthFirstDay3, lastMonthLastDay3, adminType, dimensionType, ch4)
+
+	var nowMonthAdminDataMap, lastMonthAdminDataMap1, lastMonthAdminDataMap2, lastMonthAdminDataMap3 OverseasAdminDataMap
+
+	nowMonthAdminDataMap = <-ch1
+	close(ch1)
+
+	lastMonthAdminDataMap1 = <-ch2
+	close(ch2)
+
+	lastMonthAdminDataMap2 = <-ch3
+	close(ch3)
+
+	lastMonthAdminDataMap3 = <-ch4
+	close(ch4)
+
+	adminDataMapList = make([]OverseasAdminDataMap, 0)
+	adminDataMapList = append(adminDataMapList, nowMonthAdminDataMap, lastMonthAdminDataMap1, lastMonthAdminDataMap2, lastMonthAdminDataMap3)
+	return
+}

services/statistic_report/company.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
+	"github.com/shopspring/decimal"
 	"hongze/hz_crm_api/models/company"
 	statisticModels "hongze/hz_crm_api/models/statistic_report"
 	"hongze/hz_crm_api/models/system"
@@ -106,7 +107,17 @@ func CompanyList(sysUser *system.Admin, req statisticModels.IncrementalCompanyLi
 			} else {
 				sortStr = " ORDER BY sort_todo_end_time asc, b.view_total desc, a.created_time desc"
 			}
-		} else {
+		} else if sortParam == "sellerName" {
+			sortStr = " ORDER BY CONVERT( b.seller_name USING gbk ) COLLATE gbk_chinese_ci "
+		} else if sortParam == "shareSellerName" {
+			sortStr = " ORDER BY CONVERT( b.share_seller USING gbk ) COLLATE gbk_chinese_ci "
+		} else if sortParam == "status" {
+			sortStr = " ORDER BY b.status "
+		}  else if sortParam == "serviceYears" {
+			sortStr = " ORDER BY d.first_date"
+		} else if sortParam == "latestServiceRecord" {
+			sortStr = " ORDER BY c.latest_service_record "
+		}else {
 			errMsg = "排序字段传入数据异常:" + sortParam
 			err = errors.New("获取失败")
 			return
@@ -126,21 +137,20 @@ func CompanyList(sysUser *system.Admin, req statisticModels.IncrementalCompanyLi
 	} else {
 		//2、客户列表选择“全部”时，支持按照“创建时间”对“全部”分类下所有客户列表进行升降序排列；选择“正式”时按照“转正时间”、选择“冻结”时按照“冻结时间”、选择“流失”时按照“流失时间”、选择“永续”时按照“创建时间”；
 		if status == "全部" || status == "永续" {
-			sortStr = " ORDER BY a.created_time "
+			sortStr = " ORDER BY c.latest_service_record ASC"
 		} else if status == "正式" {
-			sortStr = " ORDER BY b.formal_time "
+			sortStr = " ORDER BY b.formal_time DESC"
 		} else if status == "冻结" {
-			sortStr = " ORDER BY b.freeze_time "
+			sortStr = " ORDER BY b.freeze_time DESC"
 		} else if status == "流失" {
-			sortStr = " ORDER BY b.loss_time "
+			sortStr = " ORDER BY b.loss_time DESC"
 		} else if status == "试用" {
 			if roleTypeCode == utils.ROLE_TYPE_CODE_ADMIN {
-				sortStr = " ORDER BY all_view_total "
+				sortStr = " ORDER BY all_view_total DESC"
 			} else {
-				sortStr = " ORDER BY b.view_total "
+				sortStr = " ORDER BY b.view_total DESC"
 			}
 		}
-		sortStr += " DESC "
 	}
 
 	list, err := company.GetCompanyList(condition, status, sortStr, pars, startSize, pageSize)
@@ -500,6 +510,17 @@ func CompanyList(sysUser *system.Admin, req statisticModels.IncrementalCompanyLi
 				}
 			}
 
+			// 计算合同开始日期和结束日期之间的小时差
+			duration := time.Since(v.FirstDate).Hours()
+			hoursDiff := decimal.NewFromFloat(duration)
+
+			// 计算总小时数
+			const hoursPerYear = 24 * 365
+			totalHours := decimal.NewFromInt(hoursPerYear)
+
+			// 计算相差的年数，保留一位小数
+			numYearDecimal := hoursDiff.Div(totalHours).Round(1)
+
 			companyList := &CompanyListItem{
 				CompanyId:        v.CompanyId,
 				CompanyName:      v.CompanyName,
@@ -555,8 +576,10 @@ func CompanyList(sysUser *system.Admin, req statisticModels.IncrementalCompanyLi
 				Deadline:        tmpDeadline,
 				IsShow:          isShow,
 				TryStageSlice:   tryStageSlice,
-				ShareSellerId:   v.ShareSellerId,
 				ShareSeller:     v.ShareSeller,
+				ShareSellerId:   v.ShareSellerId,
+				LatestServiceRecord: v.LatestServiceRecord.Format(utils.FormatDate2),
+				ServiceYears: numYearDecimal.String(),
 			}
 			if strings.Contains(companyList.ApproveStatus, "已审批") {
 				companyList.ApproveStatus = ""

services/statistic_report/reponse.go

@@ -95,61 +95,63 @@ type CollectListItem struct {
 }
 
 type CompanyListItem struct {
-	CompanyId        int                         `orm:"column(company_id);pk"`
-	CompanyName      string                      `description:"客户名称"`
-	CreditCode       string                      `description:"社会统一信用码"`
-	CompanyCode      string                      `description:"客户编码"`
-	StartDate        string                      `description:"合同开始日期"`
-	EndDate          string                      `description:"合同结束日期"`
-	LoseReason       string                      `description:"流失原因"`
-	RenewalReason    string                      `description:"续约说明"`
-	FreezeReason     string                      `description:"冻结理由"`
-	LossTime         string                      `description:"流失时间"`
-	Status           string                      `description:"客户状态：'试用','永续','冻结','流失','正式' "`
-	CompanyType      string                      `description:"客户类型：ficc/权益"`
-	ApproveStatus    string                      `description:"审批状态：'待审批','已审批','驳回' 审批状态为空时，表示没有审批申请"`
-	SellerName       string                      `description:"销售：吉根龙/颖丹"`
-	SellerId         int                         `description:"销售ID"`
-	SellerIds        string                      `description:"销售ID集合，包含ficc和权益的销售id"`
-	FiccPackageType  int                         `description:"ficc的套餐类型"`
-	ExpireDay        string                      `description:"到期天数"`
-	FreezeTime       string                      `description:"冻结时间"`
-	GroupId          int                         `description:"分组id"`
-	GroupIds         string                      `description:"分组id集合，包含ficc和权益的小组id" json:"-"`
-	DepartmentId     int                         `description:"部门id"`
-	IndustryName     string                      `description:"所属行业"`
-	IsSuspend        int                         `description:"是否暂停:1:暂停,0:启用 "`
-	CreatedTime      string                      `description:"创建时间"`
-	Source           string                      `description:"客户来源"`
-	Province         string                      `description:"省"`
-	City             string                      `description:"市"`
-	Address          string                      `description:"详细地址"`
-	Reasons          string                      `description:"新增理由"`
-	FreezeStartDate  string                      `description:"冻结开始日期"`
-	FreezeEndDate    string                      `description:"冻结结束日期"`
-	FreezeExpireDays int                         `description:"冻结到期天数"`
-	ProductId        int                         `json:"-"`
-	FormalTime       string                      `description:"转正时间"`
-	IsShared         bool                        `description:"是否共享客户"`
-	RegionType       string                      `description:"区域：国内，海外"`
-	FiccView         int                         `description:"Ficc报告阅读次数"`
-	RaiView          int                         `description:"权益报告阅读次数"`
-	FiccLastViewTime string                      `description:"ficc最近一次阅读时间"`
-	RaiLastViewTime  string                      `description:"权益最近一次阅读时间"`
-	RoadShowTotal    int                         `description:"累计路演次数"`
-	TodoStatus       bool                        `description:"是否存在进行中任务，true：存在待处理的任务"`
-	CanConfirm       bool                        `description:"是否允许完成任务，true：允许完成任务"`
-	HiddenConfirm    bool                        `description:"是否隐藏完成任务按钮，true：隐藏完成任务按钮"`
-	HiddenCreate     bool                        `description:"是否隐藏新增/编辑按钮，true：隐藏新增/编辑按钮"`
-	TodoButtonColor  string                      `description:"任务按钮颜色：red，green，gray"`
-	AllViewTotal     int                         `description:"总阅读数"`
-	Deadline         string                      `description:"未完成的todo任务的截止日期，截止目前还剩余的天数"`
-	IsShow           bool                        `description:"是否有权限展示（是否属于本组或自己下面的客户）"`
-	TryStageSlice    []company.TryStageSliceItem `description:"试用状态相关"`
-	FiccTryOutDay    int                         `description:"Ficc总试用天数"`
-	RaiTryOutDay     int                         `description:"权益总试用天数"`
-	ShareSellerId    int                         `description:"分配的咨询组销售ID"`
-	ShareSeller      string                      `description:"分配的咨询组销售名称"`
+	CompanyId           int                         `orm:"column(company_id);pk"`
+	CompanyName         string                      `description:"客户名称"`
+	CreditCode          string                      `description:"社会统一信用码"`
+	CompanyCode         string                      `description:"客户编码"`
+	StartDate           string                      `description:"合同开始日期"`
+	EndDate             string                      `description:"合同结束日期"`
+	LoseReason          string                      `description:"流失原因"`
+	RenewalReason       string                      `description:"续约说明"`
+	FreezeReason        string                      `description:"冻结理由"`
+	LossTime            string                      `description:"流失时间"`
+	Status              string                      `description:"客户状态：'试用','永续','冻结','流失','正式' "`
+	CompanyType         string                      `description:"客户类型：ficc/权益"`
+	ApproveStatus       string                      `description:"审批状态：'待审批','已审批','驳回' 审批状态为空时，表示没有审批申请"`
+	SellerName          string                      `description:"销售：吉根龙/颖丹"`
+	SellerId            int                         `description:"销售ID"`
+	SellerIds           string                      `description:"销售ID集合，包含ficc和权益的销售id"`
+	FiccPackageType     int                         `description:"ficc的套餐类型"`
+	ExpireDay           string                      `description:"到期天数"`
+	FreezeTime          string                      `description:"冻结时间"`
+	GroupId             int                         `description:"分组id"`
+	GroupIds            string                      `description:"分组id集合，包含ficc和权益的小组id" json:"-"`
+	DepartmentId        int                         `description:"部门id"`
+	IndustryName        string                      `description:"所属行业"`
+	IsSuspend           int                         `description:"是否暂停:1:暂停,0:启用 "`
+	CreatedTime         string                      `description:"创建时间"`
+	Source              string                      `description:"客户来源"`
+	Province            string                      `description:"省"`
+	City                string                      `description:"市"`
+	Address             string                      `description:"详细地址"`
+	Reasons             string                      `description:"新增理由"`
+	FreezeStartDate     string                      `description:"冻结开始日期"`
+	FreezeEndDate       string                      `description:"冻结结束日期"`
+	FreezeExpireDays    int                         `description:"冻结到期天数"`
+	ProductId           int                         `json:"-"`
+	FormalTime          string                      `description:"转正时间"`
+	IsShared            bool                        `description:"是否共享客户"`
+	RegionType          string                      `description:"区域：国内，海外"`
+	FiccView            int                         `description:"Ficc报告阅读次数"`
+	RaiView             int                         `description:"权益报告阅读次数"`
+	FiccLastViewTime    string                      `description:"ficc最近一次阅读时间"`
+	RaiLastViewTime     string                      `description:"权益最近一次阅读时间"`
+	RoadShowTotal       int                         `description:"累计路演次数"`
+	TodoStatus          bool                        `description:"是否存在进行中任务，true：存在待处理的任务"`
+	CanConfirm          bool                        `description:"是否允许完成任务，true：允许完成任务"`
+	HiddenConfirm       bool                        `description:"是否隐藏完成任务按钮，true：隐藏完成任务按钮"`
+	HiddenCreate        bool                        `description:"是否隐藏新增/编辑按钮，true：隐藏新增/编辑按钮"`
+	TodoButtonColor     string                      `description:"任务按钮颜色：red，green，gray"`
+	AllViewTotal        int                         `description:"总阅读数"`
+	Deadline            string                      `description:"未完成的todo任务的截止日期，截止目前还剩余的天数"`
+	IsShow              bool                        `description:"是否有权限展示（是否属于本组或自己下面的客户）"`
+	TryStageSlice       []company.TryStageSliceItem `description:"试用状态相关"`
+	FiccTryOutDay       int                         `description:"Ficc总试用天数"`
+	RaiTryOutDay        int                         `description:"权益总试用天数"`
+	ShareSellerId       int                         `description:"分配的咨询组销售ID"`
+	ShareSeller         string                      `description:"分配的咨询组销售名称"`
+	ServiceYears        string                      `description:"客户服务年限"`
+	LatestServiceRecord string                      `description:"最近沟通时间"`
 }
 
 // CompanyRenewRecordResp 总统计信息

services/task.go

@@ -82,15 +82,7 @@ func InitContractUnusual() (err error) {
 				ficcNormalMap[v.CompanyId] = struct{}{}
 			}
 			for _, v := range contractList {
-				companyInfo, tErr := company.GetCompanyById(v.CompanyId)
-				if tErr != nil {
-					err = tErr
-					return
-				}
-				if companyInfo.IsShare == 0 {
-					companyInfo.ShareSellerId = 0
-					companyInfo.ShareSeller = ""
-				}
+
 				sellers, tErr := company.GetCompanyProductByCompanyIdAndProductId(v.CompanyId, v.ProductId)
 				if tErr != nil {
 					err = tErr
@@ -104,8 +96,6 @@ func InitContractUnusual() (err error) {
 						Source:          1,
 						SellerId:        sellers.SellerId,
 						SellerName:      sellers.SellerName,
-						ShareSellerId:   companyInfo.ShareSellerId,
-						ShareSellerName: companyInfo.ShareSeller,
 						CreateTime:      startDate,
 						ModifyTime:      startDate,
 					}

services/yb/road_video.go

@@ -330,26 +330,33 @@ func GetFiccPermission() (ret response.RoadPermissionResp, err error) {
 	if err != nil {
 		return
 	}
-	permissionFirstMap := make(map[string]*response.RoadPermissionItem)
+	permissionFirstMap := make(map[int]*response.RoadPermissionItem)
 
-	//查询首页展示的图标
+	/*//查询首页展示的图标
 	permissionFirstList, err := models.GetYbChartPermissionFirst()
 	if err != nil {
 		return
-	}
-	for _, v := range permissionFirstList {
-		permissionFirstMap[v.ClassifyName] = &response.RoadPermissionItem{
-			Id:           v.Id,
-			ClassifyName: v.YbIndexName,
+	}*/
+	permissionFirstList := make([]*response.RoadPermissionItem, 0)
+	for _, v := range permissionList {
+		if v.ParentId == 0 {
+			tmp := &response.RoadPermissionItem{
+				Id:           v.ChartPermissionId,
+				ClassifyName: v.PermissionName,
+			}
+			permissionFirstMap[v.ChartPermissionId] = tmp
+			permissionFirstList = append(permissionFirstList, tmp)
 		}
 	}
 
 	for _, v := range permissionList {
-		temp := new(response.RoadPermissionSecondItem)
-		temp.ChartPermissionID = v.ChartPermissionId
-		temp.ChartPermissionName = v.PermissionName
-		if _, ok := permissionFirstMap[v.ClassifyName]; ok {
-			permissionFirstMap[v.ClassifyName].List = append(permissionFirstMap[v.ClassifyName].List, temp)
+		if v.ParentId > 0 {
+			temp := new(response.RoadPermissionSecondItem)
+			temp.ChartPermissionID = v.ChartPermissionId
+			temp.ChartPermissionName = v.PermissionName
+			if _, ok := permissionFirstMap[v.ParentId]; ok {
+				permissionFirstMap[v.ParentId].List = append(permissionFirstMap[v.ParentId].List, temp)
+			}
 		}
 	}
 
@@ -358,7 +365,10 @@ func GetFiccPermission() (ret response.RoadPermissionResp, err error) {
 		temp := new(response.RoadPermissionItem)
 		temp.Id = v.Id
 		temp.ClassifyName = v.ClassifyName
-		temp.List = permissionFirstMap[v.ClassifyName].List
+		l, ok := permissionFirstMap[v.Id]
+		if ok {
+			temp.List = l.List
+		}
 		list = append(list, temp)
 	}
 	ret.List = list

utils/config.go

@@ -63,6 +63,7 @@ var (
 	WxMsgTemplateIdWithRoadshowDetailResult  string //路演->销售收到处理结果
 	WxMsgTemplateIdWithRoadshowDeleteNotice  string //路演->研究员收到活动删除通知
 	CYGX_WEB_URL                             string //查研观向web端网址
+	CYGX_MFYX_URL                            string //查研观向web端网址
 
 	WxMsgTemplateIdWithYbCommunityQuestion string // 研报小程序->问答社区回复通知
 	WxMsgTemplateIdWithSealApplyFinished   string // 用印申请-已签回通知
@@ -247,6 +248,7 @@ ZwIDAQAB
 		IndexNameArticleHistory = "cygx_article_history_v07_08"
 		IndexNameComprehensive = "cygx_comprehensive"
 		CYGX_WEB_URL = "https://web.hzinsights.com"
+		CYGX_MFYX_URL = "https://www.research-select.com"
 		TemplateCompanyApplyRedirectUrl = "https://ficc.hzinsights.com/approval/approval/list"
 
 		//同花顺正式地址
@@ -287,6 +289,7 @@ ZwIDAQAB
 		IndexNameArticleHistory = "cygx_article_history_v1"
 		IndexNameComprehensive = "cygx_comprehensive_test"
 		CYGX_WEB_URL = "https://clpttest.hzinsights.com"
+		CYGX_MFYX_URL = "http://test.research-select.com"
 
 		//同花顺测试地址
 		THS_SendUrl = `https://mtest.10jqka.com.cn/gateway/ps/syncNews`

utils/constants.go

@@ -10,6 +10,7 @@ const (
 	FormatTime                 = "15:04:05"                //时间格式
 	FormatTimeHm               = "15:04"                   //时间格式
 	FormatDate                 = "2006-01-02"              //日期格式
+	FormatDate2                = "06-01-02"                //日期格式
 	FormatDateUnSpace          = "20060102"                //日期格式
 	FormatDateTime             = "2006-01-02 15:04:05"     //完整时间格式
 	HlbFormatDateTime          = "2006-01-02_15:04:05.999" //完整时间格式
@@ -578,3 +579,7 @@ func GetWeeklyDatabase() (databaseName string) {
 const (
 	EnCompanyIdStep = 10000000
 )
+
+const (
+	TelAreaCodeHome = "86" // 大陆区号
+)