Merge remote-tracking branch 'origin/test' into test

@@ -1726,10 +1726,12 @@ func (srv StaffAssessServeice) SaveAssessInfo(param *command.SaveAssessInfoComma
 			continue
 			continue
 		}
 		}
 		v.Value = item.Value
 		v.Value = item.Value
-		//转换填入的评估值
-		err = v.TransformValue()
-		if err != nil {
-			return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
+		if v.Required == 1 {
+			//转换填入的评估值
+			err = v.TransformValue()
+			if err != nil {
+				return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
+			}
 		}
 		}
 		for ii := range v.Remark {
 		for ii := range v.Remark {
 			for _, vvv := range item.Remark {
 			for _, vvv := range item.Remark {

@@ -172,6 +172,7 @@ func (srv StaffAssessServeice) ListUserAssessContentCycleDay(param *query.ListAs
 		}
 		}
 		changeableRows[v.TargetUserId]["targetUserName"] = v.TargetUserName
 		changeableRows[v.TargetUserId]["targetUserName"] = v.TargetUserName
 		changeableRows[v.TargetUserId]["targetUserId"] = v.TargetUserId
 		changeableRows[v.TargetUserId]["targetUserId"] = v.TargetUserId
+		changeableRows[v.TargetUserId]["assessId"] = v.AssessId
 		if v.ContentId > 0 {
 		if v.ContentId > 0 {
 			name := fmt.Sprintf("%s-%s", v.Category, v.ContentName)
 			name := fmt.Sprintf("%s-%s", v.Category, v.ContentName)
 			key := fmt.Sprintf("k%d", i)
 			key := fmt.Sprintf("k%d", i)