Ver Fonte

fix:
删除时禁止集合为空

18339543638 há 2 anos atrás
pai
commit
b48e194105

+ 3 - 0
tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/constant/service/impl/SysConstantConfigServiceImpl.java

@@ -83,6 +83,9 @@ public class SysConstantConfigServiceImpl implements SysConstantConfigService {
     @Override
     @Override
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
     public int removeSysConstantConfigByIds(Collection<String> ids){
     public int removeSysConstantConfigByIds(Collection<String> ids){
+        if(CollectionUtil.isEmpty(ids)){
+            return 0;
+        }
         return baseRepository.deleteBatchIds(ids);
         return baseRepository.deleteBatchIds(ids);
     };
     };
 }
 }

+ 4 - 0
tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/constant/service/impl/SysConstantMenuServiceImpl.java

@@ -1,5 +1,6 @@
 package cn.tr.module.sys.constant.service.impl;
 package cn.tr.module.sys.constant.service.impl;
 
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.tr.module.sys.constant.po.SysConstantConfigPO;
 import cn.tr.module.sys.constant.po.SysConstantConfigPO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
@@ -81,6 +82,9 @@ public class SysConstantMenuServiceImpl implements SysConstantMenuService {
     @Override
     @Override
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
     public int removeSysConstantMenuByIds(Collection<String> ids){
     public int removeSysConstantMenuByIds(Collection<String> ids){
+        if(CollectionUtil.isEmpty(ids)){
+            return 0;
+        }
         return baseRepository.deleteBatchIds(ids);
         return baseRepository.deleteBatchIds(ids);
     };
     };
 }
 }

+ 3 - 0
tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/dict/service/impl/SysDictServiceImpl.java

@@ -88,6 +88,9 @@ public class SysDictServiceImpl implements ISysDictService {
     @Override
     @Override
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
     public int deleteDictByIds(Collection<String> ids) {
     public int deleteDictByIds(Collection<String> ids) {
+        if(CollectionUtil.isEmpty(ids)){
+            return 0;
+        }
         List<SysDictPO> dicts = dictRepository.selectBatchIds(ids);
         List<SysDictPO> dicts = dictRepository.selectBatchIds(ids);
         int result = dictRepository.deleteBatchIds(ids);
         int result = dictRepository.deleteBatchIds(ids);
         //找到数下所有的子节点并删除 todo
         //找到数下所有的子节点并删除 todo

+ 4 - 0
tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/log/service/impl/SysLogServiceImpl.java

@@ -1,5 +1,6 @@
 package cn.tr.module.sys.log.service.impl;
 package cn.tr.module.sys.log.service.impl;
 
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.tr.module.api.ExcelApi;
 import cn.tr.module.api.ExcelApi;
 import cn.tr.module.sys.log.dto.SysLoginLogExcelDTO;
 import cn.tr.module.sys.log.dto.SysLoginLogExcelDTO;
 import cn.tr.module.sys.log.dto.SysOperationLogExcelDTO;
 import cn.tr.module.sys.log.dto.SysOperationLogExcelDTO;
@@ -88,6 +89,9 @@ public class SysLogServiceImpl implements ISysLogService {
     @Override
     @Override
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
     public int removeSysLogByIds(Collection<String> ids){
     public int removeSysLogByIds(Collection<String> ids){
+        if(CollectionUtil.isEmpty(ids)){
+            return 0;
+        }
         return baseRepository.deleteBatchIds(ids);
         return baseRepository.deleteBatchIds(ids);
     }
     }
 
 

+ 3 - 0
tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/numStrategy/service/impl/SysNumberingStrategyServiceImpl.java

@@ -157,6 +157,9 @@ public class SysNumberingStrategyServiceImpl implements ISysNumberingStrategySer
     @Override
     @Override
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
     public int removeSysNumberingStrategyByIds(Collection<String> ids){
     public int removeSysNumberingStrategyByIds(Collection<String> ids){
+        if(CollectionUtil.isEmpty(ids)){
+            return 0;
+        }
         int result = baseRepository.deleteBatchIds(ids);
         int result = baseRepository.deleteBatchIds(ids);
         for (String id : ids) {
         for (String id : ids) {
             eventBus.publishShare(STRATEGY_REMOVE_TOPIC,id);
             eventBus.publishShare(STRATEGY_REMOVE_TOPIC,id);

+ 3 - 0
tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/storage/service/impl/StorageFileServiceImpl.java

@@ -96,6 +96,9 @@ public class StorageFileServiceImpl implements IStorageFileService {
     @Override
     @Override
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
     public void remove(Collection<String> recordIds) {
     public void remove(Collection<String> recordIds) {
+        if(CollectionUtil.isEmpty(recordIds)){
+            return ;
+        }
         List<SysStorageRecordDTO> records = storageRecordService.selectSysStorageRecordByIds(recordIds);
         List<SysStorageRecordDTO> records = storageRecordService.selectSysStorageRecordByIds(recordIds);
         Map<String, List<SysStorageRecordDTO>> recordByConfigId = records.stream()
         Map<String, List<SysStorageRecordDTO>> recordByConfigId = records.stream()
                 .collect(Collectors.groupingBy(SysStorageRecordDTO::getConfigId));
                 .collect(Collectors.groupingBy(SysStorageRecordDTO::getConfigId));

+ 4 - 0
tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/storage/service/impl/SysStorageConfigServiceImpl.java

@@ -1,5 +1,6 @@
 package cn.tr.module.sys.storage.service.impl;
 package cn.tr.module.sys.storage.service.impl;
 
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.tr.core.exception.ServiceException;
 import cn.tr.core.exception.ServiceException;
 import cn.tr.core.exception.TRExcCode;
 import cn.tr.core.exception.TRExcCode;
 import cn.tr.core.utils.JsonUtils;
 import cn.tr.core.utils.JsonUtils;
@@ -128,6 +129,9 @@ public class SysStorageConfigServiceImpl implements ISysStorageConfigService {
     @Override
     @Override
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
     public int removeSysStorageConfigByIds(Collection<String> ids){
     public int removeSysStorageConfigByIds(Collection<String> ids){
+        if(CollectionUtil.isEmpty(ids)){
+            return 0;
+        }
         Long count = baseRepository.selectCount(new LambdaQueryWrapper<SysStorageConfigPO>()
         Long count = baseRepository.selectCount(new LambdaQueryWrapper<SysStorageConfigPO>()
                 .eq(SysStorageConfigPO::getMaster, true)
                 .eq(SysStorageConfigPO::getMaster, true)
                 .in(SysStorageConfigPO::getId, ids));
                 .in(SysStorageConfigPO::getId, ids));

+ 4 - 0
tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/storage/service/impl/SysStorageRecordServiceImpl.java

@@ -1,5 +1,6 @@
 package cn.tr.module.sys.storage.service.impl;
 package cn.tr.module.sys.storage.service.impl;
 
 
+import cn.hutool.core.collection.CollectionUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
@@ -94,6 +95,9 @@ public class SysStorageRecordServiceImpl implements ISysStorageRecordService {
     @Override
     @Override
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
     public int removeSysStorageRecordByIds(Collection<String> ids){
     public int removeSysStorageRecordByIds(Collection<String> ids){
+        if(CollectionUtil.isEmpty(ids)){
+            return 0;
+        }
         return baseRepository.deleteBatchIds(ids);
         return baseRepository.deleteBatchIds(ids);
     };
     };
 }
 }

+ 3 - 0
tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/tenant/service/impl/SysTenantPackageServiceImpl.java

@@ -76,6 +76,9 @@ public class SysTenantPackageServiceImpl implements ISysTenantPackageService {
 
 
     @Override
     @Override
     public int removeSysTenantPackageByIds(Collection<String> ids) {
     public int removeSysTenantPackageByIds(Collection<String> ids) {
+        if(CollectionUtil.isEmpty(ids)){
+            return 0;
+        }
         validatePackageSource(ids);
         validatePackageSource(ids);
         List<SysTenantPO> tenants = tenantRepository.selectList(new LambdaQueryWrapper<SysTenantPO>()
         List<SysTenantPO> tenants = tenantRepository.selectList(new LambdaQueryWrapper<SysTenantPO>()
                 .in(SysTenantPO::getPackageId, ids));
                 .in(SysTenantPO::getPackageId, ids));

+ 4 - 0
tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/tenant/service/impl/SysTenantServiceImpl.java

@@ -1,6 +1,7 @@
 package cn.tr.module.sys.tenant.service.impl;
 package cn.tr.module.sys.tenant.service.impl;
 
 
 
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.tr.core.annotation.TenantIgnore;
 import cn.tr.core.annotation.TenantIgnore;
 import cn.tr.core.exception.ServiceException;
 import cn.tr.core.exception.ServiceException;
@@ -126,6 +127,9 @@ public class SysTenantServiceImpl implements ISysTenantService {
 
 
     @Override
     @Override
     public int removeSysTenantByIds(Collection<String> ids) {
     public int removeSysTenantByIds(Collection<String> ids) {
+        if(CollectionUtil.isEmpty(ids)){
+            return 0;
+        }
         String tenantId = TenantContextHolder.getTenantId();
         String tenantId = TenantContextHolder.getTenantId();
         List<SysTenantPO> tenants = tenantRepository.selectBatchIds(ids);
         List<SysTenantPO> tenants = tenantRepository.selectBatchIds(ids);
         for (SysTenantPO tenant : tenants) {
         for (SysTenantPO tenant : tenants) {