machunlei/springboot-xinda-dev
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

提交修改

Browse Source
This commit is contained in:
LEED
2025-03-27 17:15:27 +08:00
parent 6a8cbff440
commit 988e68bdc7
47 changed files with 1051 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
xinda-service/xinda-system-service/src/main/java/com/xinda/system/service/ISysDeptService.java
View File

@@ -1,5 +1,6 @@
package com.xinda.system.service;
import com.xinda.common.core.domain.TreeProSelect;
import com.xinda.common.core.domain.TreeSelect;
import com.xinda.common.core.domain.entity.SysDept;
import com.xinda.common.core.domain.entity.SysRole;
@@ -152,4 +153,6 @@ public interface ISysDeptService
* @return java.lang.Long
*/
Long selectRoleIdByDeptId(Long deptId);
public List<TreeProSelect> selectDeptProTreeList(SysDept dept);
}

16
xinda-service/xinda-system-service/src/main/java/com/xinda/system/service/impl/SysDeptServiceImpl.java
View File

@@ -2,6 +2,7 @@ package com.xinda.system.service.impl;
import com.xinda.common.annotation.DataScope;
import com.xinda.common.constant.UserConstants;
import com.xinda.common.core.domain.TreeProSelect;
import com.xinda.common.core.domain.TreeSelect;
import com.xinda.common.core.domain.entity.SysDept;
import com.xinda.common.core.domain.entity.SysRole;
@@ -82,6 +83,13 @@ public class SysDeptServiceImpl implements ISysDeptService
return buildDeptTreeSelect(depts);
}
@Override
public List<TreeProSelect> selectDeptProTreeList(SysDept dept)
{
List<SysDept> depts = SpringUtils.getAopProxy(this).selectDeptList(dept);
return buildDeptProTreeSelect(depts);
}
/**
* 构建前端所需要树结构
*
@@ -122,6 +130,12 @@ public class SysDeptServiceImpl implements ISysDeptService
return deptTrees.stream().map(TreeSelect::new).collect(Collectors.toList());
}
public List<TreeProSelect> buildDeptProTreeSelect(List<SysDept> depts)
{
List<SysDept> deptTrees = buildDeptTree(depts);
return deptTrees.stream().map(TreeProSelect::new).collect(Collectors.toList());
}
/**
* 根据角色ID查询部门树信息
*
@@ -142,7 +156,7 @@ public class SysDeptServiceImpl implements ISysDeptService
* @param deptId 部门ID
* @return 部门信息
*/
@Cacheable(value = "dept", key = "#root.methodName + '_' + #deptId", unless = "#result == null")
// @Cacheable(value = "dept", key = "#root.methodName + '_' + #deptId", unless = "#result == null")
@Override
public SysDept selectDeptById(Long deptId)
{

2
xinda-service/xinda-system-service/src/main/java/com/xinda/system/service/impl/SysUserServiceImpl.java
View File

@@ -136,7 +136,7 @@ public class SysUserServiceImpl implements ISysUserService
* @param userId 用户ID
* @return 用户对象信息
*/
@Cacheable(value = "sysUser", key = "#root.methodName + '_' + #userId", unless = "#result == null")
// @Cacheable(value = "sysUser", key = "#root.methodName + '_' + #userId", unless = "#result == null")
@Override
public SysUser selectUserById(Long userId)
{