Merge branch 'feature/0406-degree' of http://git.dayaedu.com/yonge/mec into master_saas

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/DegreeLevelFeeNew.java

@@ -35,7 +35,7 @@ public class DegreeLevelFeeNew implements Serializable {
 
     @ApiModelProperty("等级")
     @TableField(value = "level_")
-    private String level;
+    private Integer level;
 
     @ApiModelProperty("费用")
     @TableField(value = "fee_")

mec-biz/src/main/java/com/ym/mec/biz/service/impl/DegreeLevelFeeServiceImpl.java

@@ -164,10 +164,12 @@ public class DegreeLevelFeeServiceImpl extends ServiceImpl<DegreeLevelFeeMapper,
         DegreeLevelFeeNew degreeLevelFeeNew = degreeLevelFees.get(0);
         Integer subjectId = degreeLevelFeeNew.getSubjectId();
         DegreeTypeEnum degreeType = degreeLevelFeeNew.getDegreeType();
-        String levels = degreeLevelFees.stream().map(e -> e.getLevel()).collect(Collectors.joining(","));
+        String levels = degreeLevelFees.stream().map(e -> e.getLevel().toString()).collect(Collectors.joining(","));
         String level = baseMapper.checkSave(subjectId,degreeType.getCode(),levels);
         if(StringUtils.isNotEmpty(level)){
-            throw new BizException(level + "配置已存在");
+            StringBuffer sb = new StringBuffer(degreeType.getMsg());
+            sb.append("/级别").append(level).append("配置已存在");
+            throw new BizException(sb.toString());
         }
         this.saveBatch(degreeLevelFees);
     }

mec-biz/src/main/resources/config/mybatis/DegreeLevelFeeNewMapper.xml

@@ -23,7 +23,10 @@
 	</select>
 	<select id="checkSave" resultType="java.lang.String">
 		select level_ from degree_level_fee
-		where subject_id_ = #{subjectId} AND FIND_IN_SET(level_,#{levels}) AND degree_type_ = #{degreeType}
+		where FIND_IN_SET(level_,#{levels}) AND degree_type_ = #{degreeType}
+		<if test="subjectId != null">
+			AND subject_id_ = #{subjectId}
+		</if>
 	</select>
 
 </mapper>