Merge remote-tracking branch 'origin/v1.0' into v1.0

src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java

@@ -67,14 +67,14 @@ public class SysUserController {
             }
         }
         List<SysUserSalesTreeVo> treeVoList = sysUsers.stream().map(sysUser->{
-            SysDept sysDept = sysDeptService.getById(sysUser.getDeptId());
+//            SysDept sysDept = sysDeptService.getById(sysUser.getDeptId());
             SysUserSalesTreeVo treeNode = CopierUtil.copy(sysUser,new SysUserSalesTreeVo());
             treeNode.setId(sysUser.getId());
             treeNode.setParentId(sysUser.getParentId());
             treeNode.setSort(0);
-            if(sysDept!=null){
-                treeNode.setDeptName(sysDept.getName());
-            }
+//            if(sysDept!=null){
+//                treeNode.setDeptName(sysDept.getName());
+//            }
             return treeNode;
         }).collect(Collectors.toList());
         treeVoList = TreeUtil.buildByRecursive(treeVoList,TreeUtil.DEFAULT_PID_STRING);