作者 tangxvhui

bug 修复

@@ -412,6 +412,13 @@ func (c *AuditController) ChanceDataExcel() { @@ -412,6 +412,13 @@ func (c *AuditController) ChanceDataExcel() {
412 param.PageIndex = 1 412 param.PageIndex = 1
413 param.PageSize = 10000 413 param.PageSize = 10000
414 sourceData, excelHead := serveaudit.GetAuditListForExcel(param, companyId, uid) 414 sourceData, excelHead := serveaudit.GetAuditListForExcel(param, companyId, uid)
  415 + if len(sourceData) == 0 {
  416 + msg = &protocol.ResponseMessage{
  417 + Errno: 1, Errmsg: "没有数据可以导出",
  418 + }
  419 + c.ResposeJson(msg)
  420 + return
  421 + }
415 xlsMaker := exceltool.NewExcelMaker() 422 xlsMaker := exceltool.NewExcelMaker()
416 xlsMaker.SetListHead(excelHead) 423 xlsMaker.SetListHead(excelHead)
417 err = xlsMaker.MakeListExcelForBeego(sourceData) 424 err = xlsMaker.MakeListExcelForBeego(sourceData)
@@ -136,7 +136,7 @@ func GetAuditListForExcel(param protocol.RequestAuditList, companyid int64, user @@ -136,7 +136,7 @@ func GetAuditListForExcel(param protocol.RequestAuditList, companyid int64, user
136 exceltool.ExcelHead{Key: "chance_type", Name: "一级分类"}, 136 exceltool.ExcelHead{Key: "chance_type", Name: "一级分类"},
137 exceltool.ExcelHead{Key: "audit_template", Name: "二级分类"}, 137 exceltool.ExcelHead{Key: "audit_template", Name: "二级分类"},
138 exceltool.ExcelHead{Key: "nick_name", Name: "提交人"}, 138 exceltool.ExcelHead{Key: "nick_name", Name: "提交人"},
139 - exceltool.ExcelHead{Key: "department_id", Name: "提交部门"}, 139 + exceltool.ExcelHead{Key: "department", Name: "提交部门"},
140 exceltool.ExcelHead{Key: "create_at", Name: "提交时间"}, 140 exceltool.ExcelHead{Key: "create_at", Name: "提交时间"},
141 exceltool.ExcelHead{Key: "publish_status", Name: "公开状态"}, 141 exceltool.ExcelHead{Key: "publish_status", Name: "公开状态"},
142 exceltool.ExcelHead{Key: "review_status", Name: "审核状态"}, 142 exceltool.ExcelHead{Key: "review_status", Name: "审核状态"},
@@ -139,7 +139,9 @@ var CodePermissionObject = map[string]CodeToObject{ @@ -139,7 +139,9 @@ var CodePermissionObject = map[string]CodeToObject{
139 M_SYSTEM_OPPORTUNITY: NewOptionOpportunity, //机会管理 139 M_SYSTEM_OPPORTUNITY: NewOptionOpportunity, //机会管理
140 M_SYSTEM_ANNOUNCEMENT: NewPermissionOptionBase, //公告管理 140 M_SYSTEM_ANNOUNCEMENT: NewPermissionOptionBase, //公告管理
141 M_SYSTEM_ACHIEVEMENT: NewPermissionOptionBase, //成果管理 141 M_SYSTEM_ACHIEVEMENT: NewPermissionOptionBase, //成果管理
  142 + M_SYSTEM_CHECK_RESULT: NewPermissionOptionBase, //机会筛选结果
142 M_SYSTEM_RANK: NewPermissionOptionBase, //排行榜配置管理 143 M_SYSTEM_RANK: NewPermissionOptionBase, //排行榜配置管理
  144 + M_SYSTEM_RESERVE_TYPE: NewPermissionOptionBase, //储备池分类
143 } 145 }
144 146
145 func GetUserPermission(userCompanyid int64, code ...string) (map[string]PermissionOptionObject, error) { 147 func GetUserPermission(userCompanyid int64, code ...string) (map[string]PermissionOptionObject, error) {