Explorar o código

显示推送消息按钮

xyxie hai 1 semana
pai
achega
1059cefbe0
Modificáronse 4 ficheiros con 9 adicións e 2 borrados
  1. 6 0
      controllers/ppt_report.go
  2. 1 1
      controllers/ppt_v2.go
  3. 1 1
      controllers/report_v2.go
  4. 1 0
      models/ppt_v2.go

+ 6 - 0
controllers/ppt_report.go

@@ -318,6 +318,12 @@ func (this *PptV2Controller) ReportList() {
 				}
 			}
 		}
+		if v.ClassifyId != 0 {
+			classifyInfo, err := models.GetClassifyById(v.ClassifyId)
+			if err == nil && (v.State == 2 || v.State == 6) && utils.InArrayByStr(utils.REPORT_ICE_MSG_CLASSIFY_NAMES, classifyInfo.ClassifyName) {
+				t.CanSendMsg = true
+			}
+		}
 
 		resp.List = append(resp.List, t)
 	}

+ 1 - 1
controllers/ppt_v2.go

@@ -576,7 +576,7 @@ func (this *PptV2Controller) DetailPpt() {
 	canSendMsg := false
 	if pptInfo.ClassifyId != 0 {
 		classifyInfo, err := models.GetClassifyById(pptInfo.ClassifyId)
-		if err == nil && utils.InArrayByStr(utils.REPORT_ICE_MSG_CLASSIFY_NAMES, classifyInfo.ClassifyName) {
+		if err == nil && (pptInfo.State == 2 || pptInfo.State == 6) && utils.InArrayByStr(utils.REPORT_ICE_MSG_CLASSIFY_NAMES, classifyInfo.ClassifyName) {
 			canSendMsg = true
 		}
 	}

+ 1 - 1
controllers/report_v2.go

@@ -338,7 +338,7 @@ func (this *ReportController) ListReport() {
 		}
 
 		// 判断分类名称
-		if item.ClassifyIdThird != 0 && utils.InArrayByStr(utils.REPORT_ICE_MSG_CLASSIFY_NAMES, item.ClassifyNameThird) {
+		if item.ClassifyIdThird != 0 && utils.InArrayByStr(utils.REPORT_ICE_MSG_CLASSIFY_NAMES, item.ClassifyNameThird) && (item.State == 2 || item.State == 6) {
 			item.CanSendMsg = true
 		}
 	}

+ 1 - 0
models/ppt_v2.go

@@ -444,6 +444,7 @@ type PptReportItem struct {
 	Editor           PPTEditingCache            `description:"编辑人信息"`
 	AdminId          int                        `description:"创建人ID"`
 	AdminRealName    string                     `description:"创建人姓名"`
+	CanSendMsg       bool                       `description:"是否可以发送消息"`
 }
 
 type PptReportCollaborateUser struct {