huangge1199/RuoYi-Vue-Oracle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化代码

Browse Source
This commit is contained in:
RuoYi 2022-06-13 21:37:37 +08:00
parent 85d66191a5
commit a473a7702f
5 changed files with 1065 additions and 1088 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2109
sql/ry_20210908.sql → sql/ry_20220613.sql
View File

File diff suppressed because it is too large Load Diff

2
src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
View File

@ -119,7 +119,7 @@ public class DataScopeAspect
else
{
// 数据权限为仅本人且没有userAlias别名不查询任何数据
sqlString.append(" OR 1=0 ");
sqlString.append(StringUtils.format(" OR {}.dept_id = 0 ", deptAlias));
}
}
}

2
src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java
View File

@ -139,7 +139,7 @@ public class SysDeptServiceImpl implements ISysDeptService
public boolean hasChildByDeptId(Long deptId)
{
int result = deptMapper.hasChildByDeptId(deptId);
return result > 0 ? true : false;
return result > 0;
}
/**

4
src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java
View File

@ -259,7 +259,7 @@ public class SysMenuServiceImpl implements ISysMenuService
public boolean hasChildByMenuId(Long menuId)
{
int result = menuMapper.hasChildByMenuId(menuId);
return result > 0 ? true : false;
return result > 0;
}
/**
@ -272,7 +272,7 @@ public class SysMenuServiceImpl implements ISysMenuService
public boolean checkMenuExistRole(Long menuId)
{
int result = roleMenuMapper.checkMenuExistRole(menuId);
return result > 0 ? true : false;
return result > 0;
}
/**

36
src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java
View File

@ -381,23 +381,7 @@ public class SysUserServiceImpl implements ISysUserService
*/
public void insertUserRole(SysUser user)
{
Long[] roles = user.getRoleIds();
if (StringUtils.isNotNull(roles))
{
// 新增用户与角色管理
List<SysUserRole> list = new ArrayList<SysUserRole>();
for (Long roleId : roles)
{
SysUserRole ur = new SysUserRole();
ur.setUserId(user.getUserId());
ur.setRoleId(roleId);
list.add(ur);
}
if (list.size() > 0)
{
userRoleMapper.batchUserRole(list);
}
}
this.insertUserRole(user.getUserId(), user.getRoleIds());
}
/**
@ -408,10 +392,10 @@ public class SysUserServiceImpl implements ISysUserService
public void insertUserPost(SysUser user)
{
Long[] posts = user.getPostIds();
if (StringUtils.isNotNull(posts))
if (StringUtils.isNotEmpty(posts))
{
// 新增用户与岗位管理
List<SysUserPost> list = new ArrayList<SysUserPost>();
List<SysUserPost> list = new ArrayList<SysUserPost>(posts.length);
for (Long postId : posts)
{
SysUserPost up = new SysUserPost();
@ -419,10 +403,7 @@ public class SysUserServiceImpl implements ISysUserService
up.setPostId(postId);
list.add(up);
}
if (list.size() > 0)
{
userPostMapper.batchUserPost(list);
}
userPostMapper.batchUserPost(list);
}
}
@ -434,10 +415,10 @@ public class SysUserServiceImpl implements ISysUserService
*/
public void insertUserRole(Long userId, Long[] roleIds)
{
if (StringUtils.isNotNull(roleIds))
if (StringUtils.isNotEmpty(roleIds))
{
// 新增用户与角色管理
List<SysUserRole> list = new ArrayList<SysUserRole>();
List<SysUserRole> list = new ArrayList<SysUserRole>(roleIds.length);
for (Long roleId : roleIds)
{
SysUserRole ur = new SysUserRole();
@ -445,10 +426,7 @@ public class SysUserServiceImpl implements ISysUserService
ur.setRoleId(roleId);
list.add(ur);
}
if (list.size() > 0)
{
userRoleMapper.batchUserRole(list);
}
userRoleMapper.batchUserRole(list);
}
}