bug 5462
This commit is contained in:
		
							parent
							
								
									fd4b9522c0
								
							
						
					
					
						commit
						2cb0b3c60b
					
				| 
						 | 
				
			
			@ -44,7 +44,7 @@ public class MenuCustomDictServiceImpl extends ServiceImpl<MenuCustomDictMapper,
 | 
			
		|||
 | 
			
		||||
   @Override
 | 
			
		||||
   public synchronized Integer getNoRepeatCustomId(int criNum) {
 | 
			
		||||
      boolean limitFlag = this.mercMerchantApi.checkCurrentMerchantLimitFlag();
 | 
			
		||||
      //boolean limitFlag = this.mercMerchantApi.checkCurrentMerchantLimitFlag();
 | 
			
		||||
      Integer customId = this.baseMapper.selectMinCustomId(MenuCustomIfUseEnum.UNUSED.key());
 | 
			
		||||
      if (customId != null && customId <= LeConstants.MAX_CUST_LIMIT_ID) {
 | 
			
		||||
         int updateCount = this.baseMapper.update(null, Wrappers.lambdaUpdate(MenuCustomDict.class)
 | 
			
		||||
| 
						 | 
				
			
			@ -61,8 +61,8 @@ public class MenuCustomDictServiceImpl extends ServiceImpl<MenuCustomDictMapper,
 | 
			
		|||
         } else {
 | 
			
		||||
            return customId;
 | 
			
		||||
         }
 | 
			
		||||
      } else if (limitFlag) {
 | 
			
		||||
         throw new ServiceException(I18n.getMessage("menu_custom_max_over", new Object[0]));
 | 
			
		||||
//      } else if (limitFlag) {
 | 
			
		||||
//         throw new ServiceException(I18n.getMessage("menu_custom_max_over", new Object[0]));
 | 
			
		||||
      } else {
 | 
			
		||||
         return -1;
 | 
			
		||||
      }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue