作者 tangxvhui

日常保存

@@ -56,12 +56,12 @@ type EvaluationBaseAdapter struct { @@ -56,12 +56,12 @@ type EvaluationBaseAdapter struct {
56 SummaryEvaluationId int `json:"summaryEvaluationId,string"` // 56 SummaryEvaluationId int `json:"summaryEvaluationId,string"` //
57 CycleId int `json:"cycleId,string"` //周期id 57 CycleId int `json:"cycleId,string"` //周期id
58 CycleName string `json:"cycleName"` //周期名称 58 CycleName string `json:"cycleName"` //周期名称
59 - EvaluationProjectId int `json:"evaluationProjectId"` //项目id 59 + EvaluationProjectId int `json:"evaluationProjectId,string"` //项目id
60 EvaluationProjectName string `json:"evaluationProjectName"` //项目名称 60 EvaluationProjectName string `json:"evaluationProjectName"` //项目名称
61 LinkNodeId int `json:"linkNodeId,string"` //评估环节id 61 LinkNodeId int `json:"linkNodeId,string"` //评估环节id
62 BeginTime string `json:"beginTime"` //开始时间 2006-01-02 15:04:05 62 BeginTime string `json:"beginTime"` //开始时间 2006-01-02 15:04:05
63 EndTime string `json:"endTime"` //结束时间 2006-01-02 15:04:05 63 EndTime string `json:"endTime"` //结束时间 2006-01-02 15:04:05
64 - TargetUserId int `json:"targetUserId"` //被评估的目标用户,被执行的 64 + TargetUserId int `json:"targetUserId,string"` //被评估的目标用户,被执行的
65 TargetUserName string `json:"targetUserName"` // 65 TargetUserName string `json:"targetUserName"` //
66 CompanyLogo string `json:"companyLogo,"` //公司logo 66 CompanyLogo string `json:"companyLogo,"` //公司logo
67 CompanyName string `json:"companyName"` //公司名称 67 CompanyName string `json:"companyName"` //公司名称
@@ -256,7 +256,9 @@ func (srv *SummaryEvaluationService) GetMenu(param *command.QueryMenu) (map[stri @@ -256,7 +256,9 @@ func (srv *SummaryEvaluationService) GetMenu(param *command.QueryMenu) (map[stri
256 } else if cntAll360 > 0 { 256 } else if cntAll360 > 0 {
257 menu2_1.StatusName = "已完成" 257 menu2_1.StatusName = "已完成"
258 } 258 }
259 - menuList = append(menuList, menu2) 259 + if cntAll360 > 0 {
  260 + menuList = append(menuList, menu2)
  261 + }
260 menu3 := adapter.MenuListAdapter{ 262 menu3 := adapter.MenuListAdapter{
261 CycleId: 0, 263 CycleId: 0,
262 NodeName: "人资评估", 264 NodeName: "人资评估",
@@ -276,7 +278,7 @@ func (srv *SummaryEvaluationService) GetMenu(param *command.QueryMenu) (map[stri @@ -276,7 +278,7 @@ func (srv *SummaryEvaluationService) GetMenu(param *command.QueryMenu) (map[stri
276 menu3_1.StatusName = "已完成" 278 menu3_1.StatusName = "已完成"
277 } 279 }
278 //hrbp 才有这个菜单 280 //hrbp 才有这个菜单
279 - if isHrbp > 0 { 281 + if isHrbp > 0 && cntAllHrbp > 0 {
280 menuList = append(menuList, menu3) 282 menuList = append(menuList, menu3)
281 } 283 }
282 menu4 := adapter.MenuListAdapter{ 284 menu4 := adapter.MenuListAdapter{
@@ -298,7 +300,9 @@ func (srv *SummaryEvaluationService) GetMenu(param *command.QueryMenu) (map[stri @@ -298,7 +300,9 @@ func (srv *SummaryEvaluationService) GetMenu(param *command.QueryMenu) (map[stri
298 menu4_1.StatusName = "已完成" 300 menu4_1.StatusName = "已完成"
299 } 301 }
300 menu4.Child = append(menu4.Child, menu4_1) 302 menu4.Child = append(menu4.Child, menu4_1)
301 - menuList = append(menuList, menu4) 303 + if cntAllSuper > 0 {
  304 + menuList = append(menuList, menu4)
  305 + }
302 result := map[string]interface{}{ 306 result := map[string]interface{}{
303 "menus": menuList, 307 "menus": menuList,
304 } 308 }