Merge branch 'master' of http://140.143.162.39:3000/wxd/WebPeis0523

src/Shentun.WebPeis.Application/QuestionAnswers/QuestionAnswerAppService.cs

@@ -266,7 +266,8 @@ namespace Shentun.WebPeis.QuestionAnswers
             {
                 foreach (var item in input.Asbitems)
                 {
-                    var isAsbitem = await _questionAnswerAsbitemRepository.FirstOrDefaultAsync(f => f.AsbitemId == item.AsbitemId && f.QuestionAnswerId == input.QuestionAnswerId);
+                    var isAsbitem = await _questionAnswerAsbitemRepository.FirstOrDefaultAsync(f => f.AsbitemId == item.AsbitemId
+                    && f.QuestionAnswerId == input.QuestionAnswerId && f.AsbitemRecommendLevelId == item.AsbitemRecommendLevelId);
                     if (isAsbitem == null)
                     {
                         await _questionAnswerAsbitemRepository.InsertAsync(new QuestionAnswerAsbitem

src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionAnswerAsbitemConfigure.cs

@@ -14,7 +14,7 @@ namespace Shentun.WebPeis.Configures
     {
         public void Configure(EntityTypeBuilder<QuestionAnswerAsbitem> entity)
         {
-            entity.HasKey(e => new { e.QuestionAnswerId, e.AsbitemId }).HasName("question_answer_asbitem_pkey");
+            entity.HasKey(e => new { e.QuestionAnswerId, e.AsbitemId,e.AsbitemRecommendLevelId }).HasName("question_answer_asbitem_pkey");
 
             entity.ToTable("question_answer_asbitem");