刘俊驰 8 месяцев назад
Родитель
Сommit
51640ae35b

+ 4 - 6
mec-biz/src/main/java/com/ym/mec/biz/service/impl/MemberRankOrganizationFeeMapperServiceImpl.java

@@ -72,12 +72,10 @@ public class MemberRankOrganizationFeeMapperServiceImpl extends BaseServiceImpl<
 		if(memberFeeSetting == null){
 			throw new BizException("修改失败: 请设置收费标准");
 		}
-		if(!feeMapper.getOrganId().equals(memberRankOrganizationFeeMapper.getOrganId())){
-			MemberRankOrganizationFeeMapper organIdAndRankId = memberRankOrganizationFeeMapperDao.findByOrganIdAndRankId(memberRankOrganizationFeeMapper.getOrganId(), memberRankOrganizationFeeMapper.getMemberRankSettingId());
-			if(organIdAndRankId != null){
-				throw new BizException("修改失败: 该分部学练宝收费标准已存在");
-			}
-		}
+        MemberRankOrganizationFeeMapper organIdAndRankId = memberRankOrganizationFeeMapperDao.findByOrganIdAndRankId(memberRankOrganizationFeeMapper.getOrganId(), memberRankOrganizationFeeMapper.getMemberRankSettingId());
+        if(organIdAndRankId != null && !organIdAndRankId.getId().equals(feeMapper.getId())){
+            throw new BizException("修改失败: 该分部学练宝收费标准已存在");
+        }
 		memberFeeSetting.setId(feeMapper.getMemberFeeSettingId());
 		memberFeeSettingService.update(memberFeeSetting);
 		memberRankOrganizationFeeMapperDao.update(memberRankOrganizationFeeMapper);