Преглед на файлове

fix:
不能删除空数据

18339543638 преди 2 години
родител
ревизия
005b781722
променени са 21 файла, в които са добавени 61 реда и са изтрити 9 реда
  1. 3 0
      tr-modules/tr-module-gen/src/main/java/cn/tr/module/gen/modular/basic/service/impl/GenBasicServiceImpl.java
  2. 4 0
      tr-modules/tr-module-gen/src/main/java/cn/tr/module/gen/modular/config/service/impl/GenConfigServiceImpl.java
  3. 4 0
      tr-modules/tr-module-gen/src/main/resources/backend/ServiceImpl.java.btl
  4. 3 1
      tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/constant/service/impl/SysConstantConfigServiceImpl.java
  5. 3 1
      tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/constant/service/impl/SysConstantMenuServiceImpl.java
  6. 1 1
      tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/dict/service/impl/SysDictServiceImpl.java
  7. 3 1
      tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/log/service/impl/SysLogServiceImpl.java
  8. 1 1
      tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/numStrategy/service/impl/SysNumberingStrategyServiceImpl.java
  9. 6 0
      tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/sms/service/impl/SysSmsChannelServiceImpl.java
  10. 6 0
      tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/sms/service/impl/SysSmsLogServiceImpl.java
  11. 3 0
      tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/sms/service/impl/SysSmsTempServiceImpl.java
  12. 1 1
      tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/storage/service/impl/SysStorageConfigServiceImpl.java
  13. 3 1
      tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/storage/service/impl/SysStorageRecordServiceImpl.java
  14. 1 1
      tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/tenant/service/impl/SysTenantPackageServiceImpl.java
  15. 1 1
      tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/tenant/service/impl/SysTenantServiceImpl.java
  16. 3 0
      tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/user/service/impl/SysMenuServiceImpl.java
  17. 3 0
      tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/user/service/impl/SysOrgServiceImpl.java
  18. 3 0
      tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/user/service/impl/SysPortalServiceImpl.java
  19. 3 0
      tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/user/service/impl/SysPositionServiceImpl.java
  20. 3 0
      tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/user/service/impl/SysRoleServiceImpl.java
  21. 3 0
      tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/user/service/impl/SysUserServiceImpl.java

+ 3 - 0
tr-modules/tr-module-gen/src/main/java/cn/tr/module/gen/modular/basic/service/impl/GenBasicServiceImpl.java

@@ -178,6 +178,9 @@ public class GenBasicServiceImpl extends ServiceImpl<GenBasicMapper, GenBasic> i
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void delete(List<GenBasicIdParam> genBasicIdParamList) {
+        if(CollectionUtil.isEmpty(genBasicIdParamList)){
+            throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001,"请选择要删除的数据");
+        }
         List<String> basicIdIdList = CollStreamUtil.toList(genBasicIdParamList, GenBasicIdParam::getId);
         if(ObjectUtil.isNotEmpty(basicIdIdList)) {
             // 级联删除配置

+ 4 - 0
tr-modules/tr-module-gen/src/main/java/cn/tr/module/gen/modular/config/service/impl/GenConfigServiceImpl.java

@@ -14,6 +14,7 @@ package cn.tr.module.gen.modular.config.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollStreamUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.tr.core.exception.ServiceException;
@@ -66,6 +67,9 @@ public class GenConfigServiceImpl extends ServiceImpl<GenConfigMapper, GenConfig
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void delete(List<GenConfigIdParam> genConfigIdParamList) {
+        if(CollectionUtil.isEmpty(genConfigIdParamList)){
+            throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001,"请选择要删除的数据");
+        }
         List<String> basicIdIdList = CollStreamUtil.toList(genConfigIdParamList, GenConfigIdParam::getId);
         if(ObjectUtil.isNotEmpty(basicIdIdList)) {
             // 执行删除

+ 4 - 0
tr-modules/tr-module-gen/src/main/resources/backend/ServiceImpl.java.btl

@@ -5,6 +5,7 @@ import org.springframework.stereotype.Service;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.*;
 import org.springframework.transaction.annotation.Transactional;
+import cn.tr.core.exception.ServiceException;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import ${packageName}.${backendModuleName}.${busName}.repository.${className}Repository;
 import ${packageName}.${backendModuleName}.${busName}.po.${className}PO;
@@ -116,6 +117,9 @@ query.get${configList[i].fieldNameCamelCaseFirstUpper}())
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int remove${className}ByIds(Collection<String> ids){
+        if(CollectionUtil.isEmpty(ids)){
+            throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001,"请选择要删除的数据");
+        }
         return baseRepository.deleteBatchIds(ids);
     };
 }

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

@@ -1,5 +1,7 @@
 package cn.tr.module.sys.constant.service.impl;
 
+import cn.tr.core.exception.ServiceException;
+import cn.tr.core.exception.TRExcCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import cn.hutool.core.collection.CollectionUtil;
@@ -84,7 +86,7 @@ public class SysConstantConfigServiceImpl implements SysConstantConfigService {
     @Transactional(rollbackFor = Exception.class)
     public int removeSysConstantConfigByIds(Collection<String> ids){
         if(CollectionUtil.isEmpty(ids)){
-            return 0;
+            throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001,"请选择要删除的数据");
         }
         return baseRepository.deleteBatchIds(ids);
     };

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

@@ -1,6 +1,8 @@
 package cn.tr.module.sys.constant.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.tr.core.exception.ServiceException;
+import cn.tr.core.exception.TRExcCode;
 import cn.tr.module.sys.constant.po.SysConstantConfigPO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -83,7 +85,7 @@ public class SysConstantMenuServiceImpl implements SysConstantMenuService {
     @Transactional(rollbackFor = Exception.class)
     public int removeSysConstantMenuByIds(Collection<String> ids){
         if(CollectionUtil.isEmpty(ids)){
-            return 0;
+            throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001,"请选择要删除的数据");
         }
         return baseRepository.deleteBatchIds(ids);
     };

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

@@ -89,7 +89,7 @@ public class SysDictServiceImpl implements ISysDictService {
     @Transactional(rollbackFor = Exception.class)
     public int deleteDictByIds(Collection<String> ids) {
         if(CollectionUtil.isEmpty(ids)){
-            return 0;
+            throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001,"请选择要删除的数据");
         }
         List<SysDictPO> dicts = dictRepository.selectBatchIds(ids);
         int result = dictRepository.deleteBatchIds(ids);

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

@@ -1,6 +1,8 @@
 package cn.tr.module.sys.log.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.tr.core.exception.ServiceException;
+import cn.tr.core.exception.TRExcCode;
 import cn.tr.module.api.ExcelApi;
 import cn.tr.module.sys.log.dto.SysLoginLogExcelDTO;
 import cn.tr.module.sys.log.dto.SysOperationLogExcelDTO;
@@ -90,7 +92,7 @@ public class SysLogServiceImpl implements ISysLogService {
     @Transactional(rollbackFor = Exception.class)
     public int removeSysLogByIds(Collection<String> ids){
         if(CollectionUtil.isEmpty(ids)){
-            return 0;
+            throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001,"请选择要删除的数据");
         }
         return baseRepository.deleteBatchIds(ids);
     }

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

@@ -158,7 +158,7 @@ public class SysNumberingStrategyServiceImpl implements ISysNumberingStrategySer
     @Transactional(rollbackFor = Exception.class)
     public int removeSysNumberingStrategyByIds(Collection<String> ids){
         if(CollectionUtil.isEmpty(ids)){
-            return 0;
+            throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001,"请选择要删除的数据");
         }
         int result = baseRepository.deleteBatchIds(ids);
         for (String id : ids) {

+ 6 - 0
tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/sms/service/impl/SysSmsChannelServiceImpl.java

@@ -1,5 +1,8 @@
 package cn.tr.module.sys.sms.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.tr.core.exception.ServiceException;
+import cn.tr.core.exception.TRExcCode;
 import cn.tr.core.utils.JsonUtils;
 import cn.tr.plugin.eventbus.annotation.Subscribe;
 import cn.tr.plugin.eventbus.config.EventBus;
@@ -128,6 +131,9 @@ public class SysSmsChannelServiceImpl implements ISysSmsChannelService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int removeSysSmsChannelByIds(Collection<String> ids){
+        if(CollectionUtil.isEmpty(ids)){
+            throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001,"请选择要删除的数据");
+        }
         int result = baseRepository.deleteBatchIds(ids);
         eventBus.publishShare(CHANNEL_REFRESH_TOPIC,new Object());
         return result;

+ 6 - 0
tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/sms/service/impl/SysSmsLogServiceImpl.java

@@ -1,5 +1,8 @@
 package cn.tr.module.sys.sms.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.tr.core.exception.ServiceException;
+import cn.tr.core.exception.TRExcCode;
 import cn.tr.core.pojo.CommonResult;
 import cn.tr.module.sys.sms.mapper.SysSmsLogMapper;
 import cn.tr.module.sys.sms.dto.SysSmsTempDTO;
@@ -71,6 +74,9 @@ public class SysSmsLogServiceImpl implements ISysSmsLogService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int removeSysSmsLogByIds(Collection<String> ids){
+        if(CollectionUtil.isEmpty(ids)){
+            throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001,"请选择要删除的数据");
+        }
         return baseRepository.deleteBatchIds(ids);
     }
 

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

@@ -122,6 +122,9 @@ public class SysSmsTempServiceImpl implements ISysSmsTempService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int removeSysSmsTempByIds(Collection<String> ids){
+        if(CollectionUtil.isEmpty(ids)){
+            throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001,"请选择要删除的数据");
+        }
         List<SysSmsTempPO> temps = baseRepository.selectBatchIds(ids);
         for (SysSmsTempPO temp : temps) {
             if (StrUtil.equals(temp.getCreateType(), CreateEnum.sys.name())) {

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

@@ -130,7 +130,7 @@ public class SysStorageConfigServiceImpl implements ISysStorageConfigService {
     @Transactional(rollbackFor = Exception.class)
     public int removeSysStorageConfigByIds(Collection<String> ids){
         if(CollectionUtil.isEmpty(ids)){
-            return 0;
+            throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001,"请选择要删除的数据");
         }
         Long count = baseRepository.selectCount(new LambdaQueryWrapper<SysStorageConfigPO>()
                 .eq(SysStorageConfigPO::getMaster, true)

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

@@ -1,6 +1,8 @@
 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.TRExcCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -96,7 +98,7 @@ public class SysStorageRecordServiceImpl implements ISysStorageRecordService {
     @Transactional(rollbackFor = Exception.class)
     public int removeSysStorageRecordByIds(Collection<String> ids){
         if(CollectionUtil.isEmpty(ids)){
-            return 0;
+            throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001,"请选择要删除的数据");
         }
         return baseRepository.deleteBatchIds(ids);
     };

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

@@ -77,7 +77,7 @@ public class SysTenantPackageServiceImpl implements ISysTenantPackageService {
     @Override
     public int removeSysTenantPackageByIds(Collection<String> ids) {
         if(CollectionUtil.isEmpty(ids)){
-            return 0;
+            throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001,"请选择要删除的数据");
         }
         validatePackageSource(ids);
         List<SysTenantPO> tenants = tenantRepository.selectList(new LambdaQueryWrapper<SysTenantPO>()

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

@@ -128,7 +128,7 @@ public class SysTenantServiceImpl implements ISysTenantService {
     @Override
     public int removeSysTenantByIds(Collection<String> ids) {
         if(CollectionUtil.isEmpty(ids)){
-            return 0;
+            throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001,"请选择要删除的数据");
         }
         String tenantId = TenantContextHolder.getTenantId();
         List<SysTenantPO> tenants = tenantRepository.selectBatchIds(ids);

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

@@ -114,6 +114,9 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuRepository,SysMenuPO>
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int deleteSysMenuByIds(Collection<String> ids) {
+        if(CollectionUtil.isEmpty(ids)){
+            throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001,"请选择要删除的数据");
+        }
         List<SysMenuDTO> treeMenu = buildTree(self.findAllMenu());
         List<SysMenuDTO> flatTree = flatTree(treeMenu);
         Map<String, SysMenuDTO> menuMapById = flatTree.stream()

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

@@ -71,6 +71,9 @@ public class SysOrgServiceImpl implements ISysOrgService {
 
     @Override
     public int deleteSysOrgByIds(Collection<String> ids) {
+        if(CollectionUtil.isEmpty(ids)){
+            throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001,"请选择要删除的数据");
+        }
         List<SysOrgPO> orgs = orgRepository.selectBatchIds(ids);
         if(CollectionUtil.isEmpty(orgs)){
             return CollectionUtil.size(ids);

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

@@ -73,6 +73,9 @@ public class SysPortalServiceImpl implements ISysPortalService {
 
     @Override
     public int deleteSysPortalByIds(Collection<String> ids) {
+        if(CollectionUtil.isEmpty(ids)){
+            throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001,"请选择要删除的数据");
+        }
         List<SysPortalPO> portals = portalRepository.selectBatchIds(ids);
         for (SysPortalPO portal : portals) {
             if (StrUtil.equals(portal.getType(), CreateEnum.sys.name())) {

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

@@ -72,6 +72,9 @@ public class SysPositionServiceImpl implements ISysPositionService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int deleteSysPositionByIds(Collection<String> ids) {
+        if(CollectionUtil.isEmpty(ids)){
+            throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001,"请选择要删除的数据");
+        }
         long count = userPositionService.selectCountByPositionIds(ids);
         if(count!=0){
             throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001,"所选岗位中存在已被使用的岗位,无法删除");

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

@@ -98,6 +98,9 @@ public class SysRoleServiceImpl implements ISysRoleService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int deleteSysRoleByIds(Collection<String> ids) {
+        if(CollectionUtil.isEmpty(ids)){
+            throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001,"请选择要删除的数据");
+        }
         List<SysRolePO> roles = roleRepository.selectBatchIds(ids);
         for (SysRolePO role : roles) {
             if (StrUtil.equals(role.getType(), CreateEnum.sys.name())) {

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

@@ -155,6 +155,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepository,SysUserPO>
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int deleteSysUserByIds(Collection<String> ids) {
+        if(CollectionUtil.isEmpty(ids)){
+            throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001,"请选择要删除的数据");
+        }
         return baseMapper.deleteBatchIds(ids);
     }