Merge remote-tracking branch 'origin/master'

ims-service/ims-eval/src/main/java/com/ims/eval/entity/OrganizationEvaluationInfo.java

@@ -30,7 +30,7 @@ public class OrganizationEvaluationInfo extends Model {
     private String id;
 
     /**
-     * 责任书id
+     * 考评记录id
      */
     private String organizationEvaluationId;
 

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/YearGroupCoefficientServiceImpl.java

@@ -131,11 +131,12 @@ public class YearGroupCoefficientServiceImpl extends ServiceImpl<YearGroupCoeffi
 			throw new CustomException("年度系数保存失败");
 		}
 
-		if(null == coefficientDTO.getCoefficientList() || coefficientDTO.getCoefficientList().size()<=0){
-			throw new CustomException("年度系数明细为空");
-		}
+//		if(null == coefficientDTO.getCoefficientList() || coefficientDTO.getCoefficientList().size()<=0){
+//			throw new CustomException("年度系数明细为空");
+//		}
 		for (YearOperatingCoefficient coefficient : coefficientDTO.getCoefficientList()){
-			coefficient.setYearGroupCoefficientId(coefficient.getId());
+			coefficient.setYearGroupCoefficientId(coefficientDTO.getId());
+			coefficient.setYear(coefficientDTO.getYear());
 			b =	yearOperatingCoefficientService.saveOrUpdate(coefficient);
 		}