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

@@ -1057,6 +1057,7 @@ func (srv StaffAssessServeice) getAssessSelfInfoUncompleted(transactionContext a
 			ritem := domain.AssessContemtRemark{
 			ritem := domain.AssessContemtRemark{
 				Title:      vv.Title,
 				Title:      vv.Title,
 				HintText:   vv.HintText,
 				HintText:   vv.HintText,
+				Definition: vv.Definition,
 				RemarkText: "",
 				RemarkText: "",
 			}
 			}
 			remarks = append(remarks, ritem)
 			remarks = append(remarks, ritem)
@@ -1696,14 +1697,12 @@ func (srv StaffAssessServeice) SaveAssessInfo(param *command.SaveAssessInfoComma
 			continue
 			continue
 		}
 		}
 		v.Value = item.Value
 		v.Value = item.Value
-		if len(item.Value) > 0 {
 		//填入评估值描述
 		//填入评估值描述
 		reteResult, err := v.Rule.ScoreOrRating(&v.Value)
 		reteResult, err := v.Rule.ScoreOrRating(&v.Value)
 		if err != nil {
 		if err != nil {
 			return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
 			return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
 		}
 		}
 		v.ReteResult = reteResult
 		v.ReteResult = reteResult
-		}
 		for ii := range v.Remark {
 		for ii := range v.Remark {
 			for _, vvv := range item.Remark {
 			for _, vvv := range item.Remark {
 				if v.Remark[ii].Title == vvv.Title {
 				if v.Remark[ii].Title == vvv.Title {

@@ -24,6 +24,7 @@ type StaffAssessContent struct {
 type AssessContemtRemark struct {
 type AssessContemtRemark struct {
 	Title      string `json:"title"`      //comment:"填写标题"
 	Title      string `json:"title"`      //comment:"填写标题"
 	HintText   string `json:"hintText"`   // comment:"文本内容提示"
 	HintText   string `json:"hintText"`   // comment:"文本内容提示"
+	Definition string `json:"definition"` //comment:"定义"
 	RemarkText string `json:"remarkText"` // comment:"填写文本内容"
 	RemarkText string `json:"remarkText"` // comment:"填写文本内容"
 }
 }