From 271f6c018eb7fda4d96fc2109f1f8d94673b95bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Thu, 2 Dec 2021 18:50:50 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E8=A1=A5=E5=85=A8=E4=BA=8B=E5=8A=A1?= =?UTF-8?q?=E6=B3=A8=E8=A7=A3=20=E5=BC=82=E5=B8=B8=E5=9B=9E=E6=BB=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 60462822356f50abc62e152191992234979e8b1f) --- .../ruoyi/generator/service/GenTableServiceImpl.java | 8 ++++---- .../system/service/impl/SysDictTypeServiceImpl.java | 2 +- .../ruoyi/system/service/impl/SysRoleServiceImpl.java | 10 +++++----- .../ruoyi/system/service/impl/SysUserServiceImpl.java | 10 +++++----- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java index f2ffbe951..cf2109d4e 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java @@ -120,7 +120,7 @@ public class GenTableServiceImpl implements IGenTableService * @return 结果 */ @Override - @Transactional + @Transactional(rollbackFor = Exception.class) public void updateGenTable(GenTable genTable) { String options = JSON.toJSONString(genTable.getParams()); @@ -142,7 +142,7 @@ public class GenTableServiceImpl implements IGenTableService * @return 结果 */ @Override - @Transactional + @Transactional(rollbackFor = Exception.class) public void deleteGenTableByIds(Long[] tableIds) { genTableMapper.deleteGenTableByIds(tableIds); @@ -155,7 +155,7 @@ public class GenTableServiceImpl implements IGenTableService * @param tableList 导入表列表 */ @Override - @Transactional + @Transactional(rollbackFor = Exception.class) public void importGenTable(List tableList) { String operName = SecurityUtils.getUsername(); @@ -281,7 +281,7 @@ public class GenTableServiceImpl implements IGenTableService * @param tableName 表名称 */ @Override - @Transactional + @Transactional(rollbackFor = Exception.class) public void synchDb(String tableName) { GenTable table = genTableMapper.selectGenTableByName(tableName); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java index 4fb15596d..e0d1acf31 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java @@ -186,7 +186,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService * @return 结果 */ @Override - @Transactional + @Transactional(rollbackFor = Exception.class) public int updateDictType(SysDictType dict) { SysDictType oldDict = dictTypeMapper.selectDictTypeById(dict.getDictId()); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java index f53f975fe..449e18c27 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java @@ -228,7 +228,7 @@ public class SysRoleServiceImpl implements ISysRoleService * @return 结果 */ @Override - @Transactional + @Transactional(rollbackFor = Exception.class) public int insertRole(SysRole role) { // 新增角色信息 @@ -243,7 +243,7 @@ public class SysRoleServiceImpl implements ISysRoleService * @return 结果 */ @Override - @Transactional + @Transactional(rollbackFor = Exception.class) public int updateRole(SysRole role) { // 修改角色信息 @@ -272,7 +272,7 @@ public class SysRoleServiceImpl implements ISysRoleService * @return 结果 */ @Override - @Transactional + @Transactional(rollbackFor = Exception.class) public int authDataScope(SysRole role) { // 修改角色信息 @@ -338,7 +338,7 @@ public class SysRoleServiceImpl implements ISysRoleService * @return 结果 */ @Override - @Transactional + @Transactional(rollbackFor = Exception.class) public int deleteRoleById(Long roleId) { // 删除角色与菜单关联 @@ -355,7 +355,7 @@ public class SysRoleServiceImpl implements ISysRoleService * @return 结果 */ @Override - @Transactional + @Transactional(rollbackFor = Exception.class) public int deleteRoleByIds(Long[] roleIds) { for (Long roleId : roleIds) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index 7e8443c0f..fe4a9b92f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -255,7 +255,7 @@ public class SysUserServiceImpl implements ISysUserService * @return 结果 */ @Override - @Transactional + @Transactional(rollbackFor = Exception.class) public int insertUser(SysUser user) { // 新增用户信息 @@ -286,7 +286,7 @@ public class SysUserServiceImpl implements ISysUserService * @return 结果 */ @Override - @Transactional + @Transactional(rollbackFor = Exception.class) public int updateUser(SysUser user) { Long userId = user.getUserId(); @@ -308,7 +308,7 @@ public class SysUserServiceImpl implements ISysUserService * @param roleIds 角色组 */ @Override - @Transactional + @Transactional(rollbackFor = Exception.class) public void insertUserAuth(Long userId, Long[] roleIds) { userRoleMapper.deleteUserRoleByUserId(userId); @@ -462,7 +462,7 @@ public class SysUserServiceImpl implements ISysUserService * @return 结果 */ @Override - @Transactional + @Transactional(rollbackFor = Exception.class) public int deleteUserById(Long userId) { // 删除用户与角色关联 @@ -479,7 +479,7 @@ public class SysUserServiceImpl implements ISysUserService * @return 结果 */ @Override - @Transactional + @Transactional(rollbackFor = Exception.class) public int deleteUserByIds(Long[] userIds) { for (Long userId : userIds)