LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixbug:41716

Browse Source
This commit is contained in:
zhangqinlin
2021-11-01 09:14:36 +08:00
parent 29fc1ef51d
commit 834ad746d8
22 changed files with 737 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java
+14 -10
View File
@@ -103,6 +103,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
private ISysPermissionDataRuleService sysPermissionDataRuleService;
@Resource
private HuaWeiSmsUtil huaWeiSmsUtil;
@Override
// @Cacheable(cacheNames=CacheConstant.SYS_USERS_CACHE, key="#username")
@CacheEvict(cacheNames=CacheConstant.SYS_USERS_CACHE, key="#username")
@@ -1066,17 +1067,20 @@ public class SysBaseApiImpl implements ISysBaseAPI {
}
@Override
public List<String> getAllDepartIds(String departId) {
List<String> ids = new ArrayList<>();
//获取子部门全部成员(不包含本部门)
public List<String> getAllDepartIds(String departId,String orgcode,List<String> idList) {
//获取子部门全部成员(不包含本部门),会有重复id被加入ids
List<SysDepartTreeModel> sysDepartTreeModels =listSonDepartsByDepId(departId);
for(SysDepartTreeModel s:sysDepartTreeModels) {
ids.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", s.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
}
//获取本部门成员
ids.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", departId))).stream().map(SysUser::getId).collect(Collectors.toList()));
if(!(sysDepartTreeModels.size()==0)) {
for (SysDepartTreeModel s : sysDepartTreeModels) {
idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", s.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
getAllDepartIds(s.getId(),s.getOrgCode(),idList);
}
//获取本部门成员
idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgcode))).stream().map(SysUser::getId).collect(Collectors.toList()));
return ids;
return idList;
}
return idList;
}
@Override
@@ -1103,7 +1107,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
/**
* 42根据部门id查询部门所有的子级(不包含自己)
* 42根据部门id查询部门所有的子级(不包含自己)且不包含下级的下级
* @author 马志朝
* @date 2021/3/24 8:54
* @param departId 部门id