Merge branch 'dev-zhengzhou' into test

@@ -1281,6 +1281,16 @@ func (srv StaffAssessServeice) SaveSelfAssess(in *command.SaveSelfAssessCommand)
 							}
 						}
 					}
+
+					if anomalyState == domain.AnomalyState0 {
+						trimSpace := strings.TrimLeft(it.AssistContent, "\n") // 去掉前换行符
+						trimSpace = strings.TrimRight(trimSpace, "\n")        // 去掉后换行符
+						trimSpace = strings.TrimSpace(trimSpace)              // 去掉前后空格符
+						// 上级填写内容有值，选项是已辅导，变为正常
+						if !(len(trimSpace) == 0 || trimSpace == "无") && it.AssistLevel >= domain.AssistLevel2 {
+							anomalyState = domain.AnomalyState1
+						}
+					}
 					it.AnomalyState = anomalyState
 
 					// 更新里程碑状态