no message

controllers/company_user.go

@@ -6564,7 +6564,7 @@ func (this *CompanyController) EditUserOutboundMobile() {
 
 // UserPermissionList
 // @Title 联系人权限列表
-// @Description 联系人移动记录列表接口
+// @Description 联系人权限列表接口
 // @Param   UserId   query   int  true       "用户ID"
 // @Success 200 {object} company.CompanyUserListResp
 // @router /user/PermissionList [get]
@@ -6605,38 +6605,66 @@ func (this *CompanyUserController) UserPermissionList() {
 	resp := new(company.UserPermissionLookList)
 	respList := make([]*company.UserPermissionLookItem, 0)
 	checkList := make([]int, 0) // 客户拥有的权限, 用于前端匹配权限列表回显
+
 	for _, v := range permissionItems {
-		//v := permissionItems[i]
+		item := new(company.UserPermissionLookItem)
 		p := reportPermissionMap[v.ChartPermissionId]
 		if p != nil {
+
 			checkList = append(checkList, v.ChartPermissionId)
-			v.StartDate = p.StartDate
-			v.EndDate = p.EndDate
-			v.Status = p.Status
-			v.IsUpgrade = p.IsUpgrade
+			item.StartDate = p.StartDate
+			item.EndDate = p.EndDate
+			item.Status = p.Status
+
 			// 计算到期天数
-			endDateTime, _ := time.Parse(utils.FormatDate, v.EndDate)
+			endDateTime, _ := time.Parse(utils.FormatDate, item.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))
-			v.ExpireDay = expireDay
+			item.ExpireDay = expireDay
+		} else {
+			item.Status = "关闭"
+			item.ExpireDay = "0"
 		}
 
-		item := new(company.UserPermissionLookItem)
 		item.ChartPermissionId = v.ChartPermissionId
 		item.PermissionName = v.PermissionName
-		item.StartDate = v.StartDate
-		item.StartDate = v.StartDate
-		item.Status = v.Status
-		item.ExpireDay = v.ExpireDay
 		item.ClassifyName = v.ClassifyName
 		respList = append(respList, item)
 	}
+
+	// 拼接研选部分数据
+	userYanxuanPermissionMap := cygxService.GetCygxUserYanxuanPermissionMapItem([]int{userId}) // 如果是权益部门下的人，则展示研选相关的信息
+	item := new(company.UserPermissionLookItem)
+	item.ChartPermissionId = utils.CHART_PERMISSION_ID_YANXUAN
+	item.PermissionName = utils.CHART_PERMISSION_NAME_MF_YANXUAN
+	p := userYanxuanPermissionMap[userId]
+	if p != nil {
+		checkList = append(checkList, item.ChartPermissionId)
+		item.StartDate = p.StartDate
+		item.EndDate = p.EndDate
+		item.Status = p.Status
+
+		// 计算到期天数
+		endDateTime, _ := time.Parse(utils.FormatDate, item.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))
+		item.ExpireDay = expireDay
+	} else {
+		item.Status = "关闭"
+		item.ExpireDay = "0"
+	}
+	respList = append(respList, item)
 	resp.Items = respList
 	resp.CheckList = checkList
+	resp.ClassifyName = utils.COMPANY_CLASSIFY_RAI
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"

routers/commentsRouter.go

@@ -10546,6 +10546,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hz_crm_api/controllers:CompanyUserController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers:CompanyUserController"],
+        beego.ControllerComments{
+            Method: "UserPermissionList",
+            Router: `/user/PermissionList`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hz_crm_api/controllers:CompanyUserController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers:CompanyUserController"],
         beego.ControllerComments{
             Method: "AddUser",