|
|
@@ -173,27 +173,73 @@ public class SysMenuRecordServiceImpl extends ServiceImpl<SysMenuRecordMapper,
|
|
|
.eq(SysDept::getId, deptId).eq(SysDept::getDelFlag, 0));
|
|
|
if (StringUtils.isEmpty(sysDept.getComlevel())) {
|
|
|
SysDept sysDept5 = sysDeptMapper.selectById(sysDept.getParentId());
|
|
|
- SysDept sysDept4 = sysDeptMapper.selectById(sysDept5.getParentId());
|
|
|
- SysDept sysDept3 = sysDeptMapper.selectById(sysDept4.getParentId());
|
|
|
- SysDept sysDept2 = sysDeptMapper.selectById(sysDept3.getParentId());
|
|
|
- stringBuilder.append(sysDept2.getName()).append("-").append(sysDept3.getName())
|
|
|
- .append("-").append(sysDept4.getName()).append("-").append(sysDept5.getName()).append("-").append(sysDept.getName());
|
|
|
- }else if (sysDept.getComlevel().equals("5")) {
|
|
|
+ if (sysDept5 == null) {
|
|
|
+ stringBuilder.append(sysDept.getName());
|
|
|
+ } else {
|
|
|
+ SysDept sysDept4 = sysDeptMapper.selectById(sysDept5.getParentId());
|
|
|
+ if (sysDept4 == null) {
|
|
|
+ stringBuilder.append(sysDept5.getName()).append("-").append(sysDept.getName());
|
|
|
+ } else {
|
|
|
+ SysDept sysDept3 = sysDeptMapper.selectById(sysDept4.getParentId());
|
|
|
+ if (sysDept3 == null) {
|
|
|
+ stringBuilder.append(sysDept4.getName())
|
|
|
+ .append("-").append(sysDept5.getName()).append("-").append(sysDept.getName());
|
|
|
+ } else {
|
|
|
+ SysDept sysDept2 = sysDeptMapper.selectById(sysDept3.getParentId());
|
|
|
+ if (sysDept2 == null) {
|
|
|
+ stringBuilder.append(sysDept3.getName()).append("-").append(sysDept4.getName())
|
|
|
+ .append("-").append(sysDept5.getName()).append("-").append(sysDept.getName());
|
|
|
+ } else {
|
|
|
+ stringBuilder.append(sysDept2.getName()).append("-").append(sysDept3.getName())
|
|
|
+ .append("-").append(sysDept4.getName()).append("-").append(sysDept5.getName()).append("-").append(sysDept.getName());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } else if (sysDept.getComlevel().equals("5")) {
|
|
|
SysDept sysDept4 = sysDeptMapper.selectById(sysDept.getParentId());
|
|
|
- SysDept sysDept3 = sysDeptMapper.selectById(sysDept4.getParentId());
|
|
|
- SysDept sysDept2 = sysDeptMapper.selectById(sysDept3.getParentId());
|
|
|
- stringBuilder.append(sysDept2.getName()).append("-").append(sysDept3.getName()).append("-").append(sysDept4.getName()).append("-").append(sysDept.getName());
|
|
|
- }else if (sysDept.getComlevel().equals("4")) {
|
|
|
+ if (sysDept4 == null) {
|
|
|
+ stringBuilder.append(sysDept.getName());
|
|
|
+ } else {
|
|
|
+ SysDept sysDept3 = sysDeptMapper.selectById(sysDept4.getParentId());
|
|
|
+ if (sysDept3 == null) {
|
|
|
+ stringBuilder.append(sysDept4.getName()).append("-").append(sysDept.getName());
|
|
|
+ } else {
|
|
|
+ SysDept sysDept2 = sysDeptMapper.selectById(sysDept3.getParentId());
|
|
|
+ if (sysDept2 == null) {
|
|
|
+ stringBuilder.append(sysDept3.getName()).append("-").append(sysDept4.getName()).append("-").append(sysDept.getName());
|
|
|
+ } else {
|
|
|
+ stringBuilder.append(sysDept2.getName()).append("-").append(sysDept3.getName()).append("-").append(sysDept4.getName()).append("-").append(sysDept.getName());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } else if (sysDept.getComlevel().equals("4")) {
|
|
|
SysDept sysDept3 = sysDeptMapper.selectById(sysDept.getParentId());
|
|
|
- SysDept sysDept2 = sysDeptMapper.selectById(sysDept3.getParentId());
|
|
|
- stringBuilder.append(sysDept2.getName()).append("-").append(sysDept3.getName()).append("-").append(sysDept.getName());
|
|
|
- }else if (sysDept.getComlevel().equals("3")) {
|
|
|
+ if (sysDept3 == null) {
|
|
|
+ stringBuilder.append(sysDept.getName());
|
|
|
+ } else {
|
|
|
+ SysDept sysDept2 = sysDeptMapper.selectById(sysDept3.getParentId());
|
|
|
+ if (sysDept2 == null) {
|
|
|
+ stringBuilder.append(sysDept3.getName()).append("-").append(sysDept.getName());
|
|
|
+ } else {
|
|
|
+ stringBuilder.append(sysDept2.getName()).append("-").append(sysDept3.getName()).append("-").append(sysDept.getName());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } else if (sysDept.getComlevel().equals("3")) {
|
|
|
SysDept sysDept2 = sysDeptMapper.selectById(sysDept.getParentId());
|
|
|
- stringBuilder.append(sysDept2.getName()).append("-").append(sysDept.getName());
|
|
|
+ if (sysDept2 == null) {
|
|
|
+ stringBuilder.append(sysDept.getName());
|
|
|
+ } else {
|
|
|
+ stringBuilder.append(sysDept2.getName()).append("-").append(sysDept.getName());
|
|
|
+ }
|
|
|
|
|
|
- }else if (sysDept.getComlevel().equals("2")) {
|
|
|
+ } else if (sysDept.getComlevel().equals("2")) {
|
|
|
stringBuilder.append(sysDept.getName());
|
|
|
}
|
|
|
+ String s = stringBuilder.toString();
|
|
|
+ if (s.contains("总部-")) {
|
|
|
+ stringBuilder.replace(0, 3, "");
|
|
|
+ }
|
|
|
|
|
|
|
|
|
return stringBuilder.toString();
|