|
|
@@ -172,7 +172,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
|
|
|
if(!deptId.equals("")) {
|
|
|
lqw.likeRight(SysDept::getRoute, deptId);
|
|
|
}
|
|
|
- lqw.eq(StringUtils.isNotEmpty(sysCode),SysDept::getSystemCode, sysCode);
|
|
|
+ lqw.eq(StringUtils.isNotEmpty(sysCode),SysDept::getSystemCode, bySysCode.getSysCode());
|
|
|
List<SysDept> sysDeptList = list(lqw);
|
|
|
|
|
|
List<SysDeptVo> voDept = new ArrayList<>();
|
|
|
@@ -195,7 +195,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
|
|
|
item.setDivision(areaString.substring(0, areaString.length() - 1));
|
|
|
}
|
|
|
if(!Objects.isNull(item.getLeaderId())){
|
|
|
- SysUserJzgInfo userByUserId = sysUserJzgInfoService.getUserByUserId(item.getLeaderId());
|
|
|
+ SysUserJzgInfo userByUserId = sysUserJzgInfoService.getUserByUserId(item.getLeaderId(),bySysCode.getSysCode());
|
|
|
if(!Objects.isNull(userByUserId)){
|
|
|
item.setLeaderName(userByUserId.getName());
|
|
|
}
|