作者 tangxvhui

修复一些问题

... ... @@ -663,7 +663,9 @@ func (srv StaffAssessServeice) ExportUserAssess2(param *query.SummaryCommand) (*
//填写在第几行
axisNum := 7 + 3*i5
axis := fmt.Sprintf("%s%d", colName, axisNum)
xlsxFile.SetCellStr(v, axis, eData.data[k1].String())
if d, ok := eData.data[k1]; ok {
xlsxFile.SetCellStr(v, axis, d.String())
}
//单元格高度按三个单元格合并
axisEnd := fmt.Sprintf("%s%d", colName, axisNum+2)
xlsxFile.MergeCell(v, axis, axisEnd)
... ...
... ... @@ -1122,7 +1122,7 @@ func (d *StaffAssessDao) SearchContentCategoryName(companyId int, cycleId int, u
target_user_id,target_user_name
order by cnt desc,target_user_id
`
sqlStr0 := d.useTStaffAssess(companyId, cycleId, userId, "", hrbp, 0, 5000, string(domain.AssessSelf))
sqlStr0 := d.useTStaffAssess(companyId, cycleId, userId, "", hrbp, 5000, 0, string(domain.AssessSelf))
sqlStr = sqlStr0 + sqlStr
tx := d.transactionContext.PgTx
result := []ContentCategoryName{}
... ...