Merge branch 'cygx/need_979' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/company_seller.go

@@ -5316,28 +5316,53 @@ func (this *CompanySellerController) RaiServeSellerList() {
 		return
 	}
 	resp := make([]company.DepartmentGroupSellers, 0)
-
-	groupId := 0
+	groupIds := []int{}
 	if utils.RunMode == "release" {
-		groupId = 68
+		groupIds = []int{68, 72}
 	} else {
-		groupId = 132
+		groupIds = []int{132, 134}
 	}
-	subAdmins, err := system.GetAdminByGroupId(groupId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+
+	groupNameList, err := system.GetSysGroupByGroupIds(groupIds)
+	if err != nil {
 		br.Msg = "获取销售失败"
-		br.ErrMsg = "获取销售失败,Err:" + err.Error()
+		br.ErrMsg = "获取组别信息失败,Err:" + err.Error()
 		return
 	}
 
-	for _, seller := range subAdmins {
-		sellerItem := company.DepartmentGroupSellers{
-			AdminId:      fmt.Sprint(seller.AdminId),
-			RealName:     seller.RealName,
-			Authority:    seller.Authority,
-			RoleTypeCode: seller.RoleTypeCode,
+	for _, group := range groupNameList {
+		groupSellerList := make([]company.DepartmentGroupSellers, 0)
+		groupItem := company.DepartmentGroupSellers{
+			AdminId: fmt.Sprint("group_", group.DepartmentId),
+			//AdminName string `description:"系统用户名称"`
+			RealName:     group.GroupName,
+			ChildrenList: groupSellerList,
+		}
+		teamSellerList := make([]company.DepartmentGroupSellers, 0)
+		sellerList, err := system.GetAdminByGroupId(group.GroupId)
+		if err != nil && err.Error() != utils.ErrNoRow() {
+			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,
+			}
+			teamSellerList = append(teamSellerList, sellerItem)
+		}
+		groupItem.ChildrenList = teamSellerList
+		if len(teamSellerList) > 0 {
+			groupSellerList = append(groupSellerList, groupItem)
+		}
+		if len(groupSellerList) > 0 {
+			resp = append(resp, groupItem)
 		}
-		resp = append(resp, sellerItem)
 	}
 
 	br.Ret = 200

models/system/sys_group.go

@@ -2,6 +2,7 @@ package system
 
 import (
 	"github.com/beego/beego/v2/client/orm"
+	"hongze/hz_crm_api/utils"
 	"time"
 )
 
@@ -122,6 +123,17 @@ func GetSysGroupByDirectorId(directorId int) (items []*SysGroupList, err error)
 	return
 }
 
+func GetSysGroupByGroupIds(groupIds []int) (items []*SysGroupList, err error) {
+	lenArr := len(groupIds)
+	if lenArr == 0 {
+		return
+	}
+	sql := `SELECT * FROM sys_group WHERE group_id IN  (` + utils.GetOrmInReplace(lenArr) + `) ORDER BY sort ASC, create_time ASC`
+	o := orm.NewOrm()
+	_, err = o.Raw(sql, groupIds).QueryRows(&items)
+	return
+}
+
 // GetSysGroupByGroupId 销售主管用，查找销售主管所在大组的名称
 func GetSysGroupByGroupId(groupId int) (items []*SysGroupList, err error) {
 	sql := `SELECT * FROM sys_group WHERE department_id=2 AND parent_id=0 AND group_id=? ORDER BY sort ASC, create_time ASC`

services/company.go

@@ -2428,8 +2428,8 @@ func GetShareCompanyPermissionButton(roleTypeCode, statuses string, productId in
 		button.BtnServiceRecord = true
 	}
 
-	//梁春悦的单独展示
-	if sysUser.RoleName == "权益服务组长" {
+	//梁春悦、罗礼智的单独展示
+	if sysUser.RoleName == "权益服务组长" || sysUser.RoleName == "权益销售组长（外部）" {
 		button.BtnModifySeller = true
 	}
 	if roleTypeCode == utils.ROLE_TYPE_CODE_ADMIN {