日常保存

@@ -56,12 +56,12 @@ type EvaluationBaseAdapter struct {
 	SummaryEvaluationId   int    `json:"summaryEvaluationId,string"` //
 	SummaryEvaluationId   int    `json:"summaryEvaluationId,string"` //
 	CycleId               int    `json:"cycleId,string"`             //周期id
 	CycleId               int    `json:"cycleId,string"`             //周期id
 	CycleName             string `json:"cycleName"`                  //周期名称
 	CycleName             string `json:"cycleName"`                  //周期名称
-	EvaluationProjectId   int    `json:"evaluationProjectId"`        //项目id
+	EvaluationProjectId   int    `json:"evaluationProjectId,string"` //项目id
 	EvaluationProjectName string `json:"evaluationProjectName"`      //项目名称
 	EvaluationProjectName string `json:"evaluationProjectName"`      //项目名称
 	LinkNodeId            int    `json:"linkNodeId,string"`          //评估环节id
 	LinkNodeId            int    `json:"linkNodeId,string"`          //评估环节id
 	BeginTime             string `json:"beginTime"`                  //开始时间 2006-01-02 15:04:05
 	BeginTime             string `json:"beginTime"`                  //开始时间 2006-01-02 15:04:05
 	EndTime               string `json:"endTime"`                    //结束时间 2006-01-02 15:04:05
 	EndTime               string `json:"endTime"`                    //结束时间 2006-01-02 15:04:05
-	TargetUserId          int    `json:"targetUserId"`               //被评估的目标用户,被执行的
+	TargetUserId          int    `json:"targetUserId,string"`        //被评估的目标用户,被执行的
 	TargetUserName        string `json:"targetUserName"`             //
 	TargetUserName        string `json:"targetUserName"`             //
 	CompanyLogo           string `json:"companyLogo,"`               //公司logo
 	CompanyLogo           string `json:"companyLogo,"`               //公司logo
 	CompanyName           string `json:"companyName"`                //公司名称
 	CompanyName           string `json:"companyName"`                //公司名称

@@ -256,7 +256,9 @@ func (srv *SummaryEvaluationService) GetMenu(param *command.QueryMenu) (map[stri
 	} else if cntAll360 > 0 {
 	} else if cntAll360 > 0 {
 		menu2_1.StatusName = "已完成"
 		menu2_1.StatusName = "已完成"
 	}
 	}
-	menuList = append(menuList, menu2)
+	if cntAll360 > 0 {
+		menuList = append(menuList, menu2)
+	}
 	menu3 := adapter.MenuListAdapter{
 	menu3 := adapter.MenuListAdapter{
 		CycleId:    0,
 		CycleId:    0,
 		NodeName:   "人资评估",
 		NodeName:   "人资评估",
@@ -276,7 +278,7 @@ func (srv *SummaryEvaluationService) GetMenu(param *command.QueryMenu) (map[stri
 		menu3_1.StatusName = "已完成"
 		menu3_1.StatusName = "已完成"
 	}
 	}
 	//hrbp 才有这个菜单
 	//hrbp 才有这个菜单
-	if isHrbp > 0 {
+	if isHrbp > 0 && cntAllHrbp > 0 {
 		menuList = append(menuList, menu3)
 		menuList = append(menuList, menu3)
 	}
 	}
 	menu4 := adapter.MenuListAdapter{
 	menu4 := adapter.MenuListAdapter{
@@ -298,7 +300,9 @@ func (srv *SummaryEvaluationService) GetMenu(param *command.QueryMenu) (map[stri
 		menu4_1.StatusName = "已完成"
 		menu4_1.StatusName = "已完成"
 	}
 	}
 	menu4.Child = append(menu4.Child, menu4_1)
 	menu4.Child = append(menu4.Child, menu4_1)
-	menuList = append(menuList, menu4)
+	if cntAllSuper > 0 {
+		menuList = append(menuList, menu4)
+	}
 	result := map[string]interface{}{
 	result := map[string]interface{}{
 		"menus": menuList,
 		"menus": menuList,
 	}
 	}