修复快捷工具无法显示

This commit is contained in:
hero920103 committed 2026-10-30 17:29:28 +08:00
1 parent 9898962836
commit 2e2b837a20
23 files changed
+1941 -38

No files matched your search

+19 -1
View File
@@ -132,7 +132,7 @@ func (c *BackendOrganizationController) assembleEmployeeDTO(
func (c *BackendOrganizationController) positionDTO(tid uint64, row models.BackendPosition) positionDTO {
nameByID := c.orgNameMap(tid)
return positionDTO{
dto := positionDTO{
ID: row.ID,
Tid: row.Tid,
TenantID: row.Tid,
@@ -141,11 +141,29 @@ func (c *BackendOrganizationController) positionDTO(tid uint64, row models.Backe
PositionCode: row.PositionCode,
PositionName: row.PositionName,
PositionType: row.PositionType,
RankID: row.RankID,
Status: row.Status,
Sort: row.Sort,
Remark: derefString(row.Remark),
CreateTime: formatDateTime(&row.CreateTime),
}
// 职级名称:职位挂了职级才显示,未设置时留空由前端显示「-」。
if row.RankID > 0 {
if rank, ok := c.jobRankMap(tid)[row.RankID]; ok {
dto.RankName = rank.RankName
dto.RankLevelNo = rank.LevelNo
}
}
return dto
}
// jobRankMap 取租户内的职级映射,单次请求内只查一次。
func (c *BackendOrganizationController) jobRankMap(tid uint64) map[uint64]models.BackendJobRank {
if c.jobRanks == nil || c.jobRanksTid != tid {
c.jobRanks = JobRankMap(tid)
c.jobRanksTid = tid
}
return c.jobRanks
}
// ---------------------------------------------------------------------------