考级区分机构

mec-biz/src/main/java/com/ym/mec/biz/dal/mapper/DegreeLevelFeeMapper.java

@@ -29,5 +29,6 @@ public interface DegreeLevelFeeMapper extends BaseMapper<DegreeLevelFeeNew> {
     String checkSave(@Param("subjectId") Integer subjectId,
 					 @Param("degreeType") String degreeType,
 					 @Param("levels") String levels,
-					 @Param("degreeLevelFeeId") Integer degreeLevelFeeId);
+					 @Param("degreeLevelFeeId") Integer degreeLevelFeeId,
+					 @Param("tenantId") Integer tenantId);
 }

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

@@ -146,14 +146,18 @@ public class DegreeLevelFeeServiceImpl extends ServiceImpl<DegreeLevelFeeMapper,
         }
         DegreeLevelFeeNew degreeLevelFeeNew = degreeLevelFees.get(0);
         String levels = degreeLevelFees.stream().map(e -> e.getLevel().toString()).collect(Collectors.joining(","));
-        this.check(degreeLevelFeeNew.getSubjectId(),degreeLevelFeeNew.getDegreeType(),levels,null);
+        this.check(degreeLevelFeeNew.getSubjectId(),degreeLevelFeeNew.getDegreeType(),levels,null,degreeLevelFeeNew.getTenantId());
         this.saveBatch(degreeLevelFees);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(DegreeLevelFeeNew degreeLevelFee) {
-        this.check(degreeLevelFee.getSubjectId(),degreeLevelFee.getDegreeType(),degreeLevelFee.getLevel().toString(),degreeLevelFee.getId());
+        this.check(degreeLevelFee.getSubjectId(),
+                degreeLevelFee.getDegreeType(),
+                degreeLevelFee.getLevel().toString(),
+                degreeLevelFee.getId(),
+                degreeLevelFee.getTenantId());
         if(degreeLevelFee.getDegreeType() == DegreeTypeEnum.THEORY){
             this.lambdaUpdate().eq(DegreeLevelFeeNew::getId,degreeLevelFee.getId())
                     .set(DegreeLevelFeeNew::getLevel,degreeLevelFee.getLevel())
@@ -166,8 +170,8 @@ public class DegreeLevelFeeServiceImpl extends ServiceImpl<DegreeLevelFeeMapper,
         }
     }
 
-    private void check(Integer subjectId,DegreeTypeEnum degreeType,String levels,Integer degreeLevelFeeId){
-        String level = baseMapper.checkSave(subjectId,degreeType.getCode(),levels,degreeLevelFeeId);
+    private void check(Integer subjectId,DegreeTypeEnum degreeType,String levels,Integer degreeLevelFeeId,Integer tenantId){
+        String level = baseMapper.checkSave(subjectId,degreeType.getCode(),levels,degreeLevelFeeId,tenantId);
         if(StringUtils.isNotEmpty(level)){
             StringBuffer sb = new StringBuffer(degreeType.getMsg());
             sb.append("/级别").append(level).append("配置已存在");

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

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