Merge branch 'crm/crm_17.1_rai' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/company_apply.go

@@ -610,6 +610,16 @@ func (this *CompanyApplyController) ApplyContractDetail() {
 			plist.CheckList = checkList
 			detail.PermissionList = append(detail.PermissionList, plist)
 		}
+
+		if detail.WxUserId > 0 {
+			userInfo, err := models.GetWxUserByUserId(detail.WxUserId)
+			if err != nil {
+				br.Msg = "获取联系人异常！"
+				br.ErrMsg = "获取联系人异常，Err:" + err.Error()
+				return
+			}
+			detail.WxUserName = userInfo.RealName
+		}
 	}
 
 	resp := new(company.CompanyContractDetailResp)

controllers/company_approval.go

@@ -548,6 +548,7 @@ func (this *CompanyApprovalController) List() {
 				//DelayPermission   :
 				ApplyRealName: item.ApplyRealName,
 				ApplyUserId:   item.ApplyUserId,
+				WxUserId:      item.WxUserId,
 				OpButton:      opButton,
 			}
 

controllers/company_permission.go

@@ -24,6 +24,7 @@ type CompanyPermissionController struct {
 // @Param   CompanyStatus   query   string  true       "客户状态"
 // @Param   NoUpgrade   query   bool  false       "是否不展示升级权限，默认为 false"
 // @Param   IsShowYanXuanKouDian   query   bool  false       "是否展示研选扣点包，默认为 false"
+// @Param   IsRaiUser   query   bool  false       "是否为权益用户个人权限，默认为 false"
 // @Success 200 {object} company.PermissionSetResp
 // @router /permission/list [get]
 func (this *CompanyPermissionController) List() {
@@ -45,12 +46,41 @@ func (this *CompanyPermissionController) List() {
 	noUpgrade, _ := this.GetBool("NoUpgrade", false)                       // 添加客户、领取客户=true; 申请转正、续约申请=false
 	isShowYanXuanKouDian, _ := this.GetBool("IsShowYanXuanKouDian", false) // 是否展示研选扣点
 	companyStatus := this.GetString("CompanyStatus")                       // 客户状态
+	isRaiUser, _ := this.GetBool("IsRaiUser", false)                       // 是否展示研选扣点
 	if strings.Contains(companyStatus, utils.COMPANY_STATUS_X_CLASS_TRY_OUT) || strings.Contains(companyStatus, utils.COMPANY_STATUS_FOREVER) {
 		companyStatus = utils.COMPANY_STATUS_FOREVER
 	}
 	var productId int
 	resp := new(company.PermissionSetResp)
 
+	//权益个人用户展示逻辑
+	if isRaiUser {
+		productId = utils.COMPANY_PRODUCT_RAI_ID
+		// 权益
+		if productId == utils.COMPANY_PRODUCT_RAI_ID {
+			p := new(company.PermissionSetList)
+			items, err := company.GetPermissionSetItemsByTypeByUser(productId)
+			if err != nil {
+				br.Msg = "获取失败"
+				br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
+				return
+			}
+			for _, v := range items {
+				v.SetMenuChartPermissionId = make([]int, 0)
+				v.Child = make([]*company.PermissionSetItem, 0)
+				p.Items = append(p.Items, v)
+			}
+			p.ClassifyName = utils.COMPANY_PRODUCT_RAI_NAME
+			p.CheckList = make([]int, 0)
+			resp.List = append(resp.List, p)
+		}
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "获取成功"
+		br.Data = resp
+		return
+	}
+
 	roleTypeCode := sysUser.RoleTypeCode
 	productId = services.GetProductId(roleTypeCode)
 

models/company/company_apply.go

@@ -124,6 +124,8 @@ type CompanyContractDetail struct {
 	Source            string    `description:"合同来源：上传附件, 系统合同"`
 	SourceTag         string    `description:"合同来源标签：非标合同，标准合同"`
 	AllocationType    int       `description:"分配方式，0手动分配，1X录分之后自动分配，默认0"`
+	WxUserId          int       `description:"用户id，针对某份合同仅对单个用户使用的时候的场景"`
+	WxUserName        string    `description:"用户姓名，针对某份合同仅对单个用户使用的时候的场景"`
 	PermissionList    []*PermissionLookList
 }
 

models/company/company_approval.go

@@ -116,6 +116,7 @@ type CompanyApprovalList struct {
 	OpButton          ApprovalButton `description:"操作权限"`
 	ApplyContractType int            `description:"申请合同类型  0 非标  1 标准"`
 	ApplyUserId       int            `description:"申请人编号id" json:"-"`
+	WxUserId          int            `description:"用户id，针对某份合同仅对单个用户使用的时候的场景"`
 }
 
 // ApprovalButton 审批操作权限