Merge remote-tracking branch 'origin/14.6'

controllers/company_share.go

@@ -176,8 +176,13 @@ func (this *CompanyController) CompanyShareList() {
 				pars = append(pars, productId)
 			}
 			if sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_ADMIN && sysUser.AdminId != 66 && sysUser.AdminId != 15 {
-				condition += ` AND a.share_seller_id=? `
-				pars = append(pars, sysUser.AdminId)
+				if sysUser.GroupId == groupId {
+					condition += ` AND a.share_seller_id=? `
+					pars = append(pars, sysUser.AdminId)
+				} else {
+					condition += ` AND b.seller_id=? `
+					pars = append(pars, sysUser.AdminId)
+				}
 			}
 		}
 	}
@@ -591,9 +596,17 @@ func (this *CompanyController) CompanyShareList() {
 	if companyLists == nil {
 		companyLists = make([]*company.CompanyListItem, 0)
 	}
+
+	var isShareGroup bool
+	if sysUser.GroupId == groupId {
+		isShareGroup = true
+	}
+
 	page = paging.GetPaging(currentIndex, pageSize, total)
 	resp := new(company.CompanyListResp)
 	resp.List = companyLists
+	resp.IsShareGroup = isShareGroup
+	resp.Status = listParam
 	resp.Paging = page
 	br.Ret = 200
 	br.Success = true

controllers/sys_menu.go

@@ -90,18 +90,18 @@ func (this *SysRoleController) SysMenuList() {
 				}
 			}
 		}
-		for i, menu := range child {
-			if menu.Name == "正式客户共享" && sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_ADMIN &&
-				sysUser.AdminId != 66 && sysUser.AdminId != 15 {
-				//如果不是admin角色、共享客户分组下用户、楼颖丹账号、王沛账号 就不显示该页面
-				if ok, _ := shareSellerMap[sysUser.AdminId]; !ok {
-					child = append(child[:i], child[i+1:]...)
-				}
-			}
-			//if menu.Name == "正式客户共享" && !utils.InArrayByStr([]string{utils.ROLE_TYPE_CODE_ADMIN, utils.ROLE_TYPE_CODE_FICC_ADMIN, utils.ROLE_TYPE_CODE_FICC_SELLER, utils.ROLE_TYPE_CODE_FICC_GROUP, utils.ROLE_TYPE_CODE_FICC_TEAM}, sysUser.RoleTypeCode) {
-			//	child = append(child[:i], child[i+1:]...)
-			//}
-		}
+		//for i, menu := range child {
+		//	if menu.Name == "正式客户共享" && sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_ADMIN &&
+		//		sysUser.AdminId != 66 && sysUser.AdminId != 15 {
+		//		//如果不是admin角色、共享客户分组下用户、楼颖丹账号、王沛账号 就不显示该页面
+		//		if ok, _ := shareSellerMap[sysUser.AdminId]; !ok {
+		//			child = append(child[:i], child[i+1:]...)
+		//		}
+		//	}
+		//	//if menu.Name == "正式客户共享" && !utils.InArrayByStr([]string{utils.ROLE_TYPE_CODE_ADMIN, utils.ROLE_TYPE_CODE_FICC_ADMIN, utils.ROLE_TYPE_CODE_FICC_SELLER, utils.ROLE_TYPE_CODE_FICC_GROUP, utils.ROLE_TYPE_CODE_FICC_TEAM}, sysUser.RoleTypeCode) {
+		//	//	child = append(child[:i], child[i+1:]...)
+		//	//}
+		//}
 
 		if strings.Contains(item.Name, "出差管理") && sysUser.AdminId == utils.ApproveUserId {
 			cm := new(system.ChildMenu)

models/company/company.go

@@ -285,6 +285,8 @@ type CompanyListResp struct {
 	StatusCount   []*CompanyStatus
 	TryStageCount []*CompanyTryStageCount
 	AddCompanyBtn bool
+	IsShareGroup  bool `description:"是否咨询组销售"`
+	Status        int  `description:"是否咨询组销售"`
 }
 
 func GetCompanyListCount(condition string, pars []interface{}) (count int, err error) {