Parcourir la source

行社机构树;

jiawuxian il y a 2 ans
Parent
commit
d793dc6670

+ 1 - 0
soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/SysUser.java

@@ -46,6 +46,7 @@ public class SysUser extends BaseEntity {
      * 部门
      */
     @ApiModelProperty(value = "部门")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long deptId;
 
     /**

+ 3 - 1
soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysDeptServiceImpl.java

@@ -170,7 +170,9 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
                         }
                     });
         });
-        hangshelist.addAll(cacheList.stream().filter(o -> parentIds.contains(o.getId())).collect(Collectors.toList()));
+        hangshelist.addAll(cacheList.stream()
+                .filter(o -> parentIds.contains(o.getId()) && ObjectUtil.isNotEmpty(o.getPath()) && o.getPath().startsWith(sysOrg.getPath()))
+                .collect(Collectors.toList()));
 
         return generateTree(hangshelist, sysOrg);
     }