diff --git a/yxt-supervise-cyf/docs/databases/create_table.sql b/yxt-supervise-cyf/docs/databases/create_table.sql
index b70f89e6..ba5ee867 100644
--- a/yxt-supervise-cyf/docs/databases/create_table.sql
+++ b/yxt-supervise-cyf/docs/databases/create_table.sql
@@ -383,6 +383,10 @@ CREATE TABLE `sys_user`  (
 `mobile` varchar(11) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '手机号',
 `userType` int(0) NULL DEFAULT NULL COMMENT '用户类型:1员工、2客户、3供应商',
 `headImage` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '用户头像',
+`roleSid` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '角色 ',
+`orgSid` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '岗位',
+`postSid` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '部门',
+`name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '员工名',
 PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
 
@@ -781,3 +785,56 @@ CREATE TABLE `sys_role`  (
 PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 7 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '角色' ROW_FORMAT = Dynamic;
 
+DROP TABLE IF EXISTS `sys_menu_role`;
+CREATE TABLE `sys_menu_role`  (
+`id` int(0) NOT NULL AUTO_INCREMENT,
+`sid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'sid',
+`lockVersion` int(0) NOT NULL DEFAULT 0 COMMENT '记录版本，锁',
+`createTime` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '记录创建时间',
+`modifyTime` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '记录最后修改时间',
+`isEnable` int(0) NOT NULL DEFAULT 1 COMMENT '记录是否可用，1:可用，0:不可用',
+`state` int(0) NULL DEFAULT 1 COMMENT '隐藏本部门:隐藏本部门开启后，本部门将不会显示在公司通讯录中',
+`isDelete` int(0) NULL DEFAULT NULL COMMENT '记录是否被删除，0:未删除，1:已经删除',
+`remarks` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注信息',
+`createBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建者',
+`updateBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '更新者',
+`menuSid` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '菜单sid',
+`roleSid` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '角色sid',
+PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 14389 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '菜单与角色关联表' ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;
+
+
+DROP TABLE IF EXISTS `sys_menu`;
+CREATE TABLE `sys_menu`  (
+`id` int(0) NOT NULL AUTO_INCREMENT,
+`sid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'sid',
+`lockVersion` int(0) NOT NULL DEFAULT 0 COMMENT '记录版本，锁',
+`createTime` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '记录创建时间',
+`modifyTime` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '记录最后修改时间',
+`isEnable` int(0) NOT NULL DEFAULT 1 COMMENT '记录是否可用，1:可用，0:不可用',
+`state` int(0) NULL DEFAULT 1 COMMENT '隐藏本部门:隐藏本部门开启后，本部门将不会显示在公司通讯录中',
+`isDelete` int(0) NULL DEFAULT NULL COMMENT '记录是否被删除，0:未删除，1:已经删除',
+`remarks` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注信息',
+`createBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建者',
+`updateBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '更新者',
+`name` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '菜单名称',
+`menuUrl` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '菜单路由路径(VUE)',
+`pageUrl` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '菜单对应的前端页面路径',
+`iconUrl` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '菜单图标地址',
+`sourceSid` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '资源sid',
+`isShow` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '1' COMMENT '是否显示,默认为1显示，0为不显示',
+`sortNo` int(0) NULL DEFAULT NULL COMMENT '排序号',
+`pSid` varchar(300) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0' COMMENT '上级sid',
+`pageUrlRedirect` int(0) NULL DEFAULT NULL COMMENT '前端页面路径重定向',
+`pageName` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '前端页面名称（vue组件名）',
+`pageAliasName` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '前端页面别名',
+`menuType` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '菜单类型（0左侧当行菜单，1页面中功能）',
+PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 263 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '菜单表' ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;
+
+
+
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/sysmenu/CyfSysMenuRest.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/sysmenu/CyfSysMenuRest.java
index a740369e..c622afb6 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/sysmenu/CyfSysMenuRest.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/sysmenu/CyfSysMenuRest.java
@@ -88,6 +88,31 @@ public class CyfSysMenuRest {
         List<SysMenuTreeVo> list = sysMenuService.listAllVoFor(query);
         return rb.success().setData(list);
     }
+//    @ApiOperation("根据资源sid查询所有数据列表 ")
+//    @PostMapping("/sourcemenutree")
+//    public ResultBean<List<Map<String, Object>>> sourcemenutree(@RequestBody SysMenuQuery query) {
+//        ResultBean<List<Map<String, Object>>> rb = ResultBean.fireFail();
+//        SysMenuRoleQuery orgRoleMenuQuery = new SysMenuRoleQuery();
+//        List<Map<String, Object>> list = new ArrayList<>();
+//        if (null == query)
+//            return rb.setData(list);
+//
+//        //if业务角色存在，则查询业务角色的菜单列表，否则查询平台角色的菜单列表
+//        List<SysUserRoleVo> userRole = sysUserRoleService.selectByUserSid(query.getUserSid());
+//        List<String> roleSids = userRole.stream().map(s -> s.getRoleSid()).collect(Collectors.toList());
+//        for (String roleSid : roleSids) {
+//            Integer type = sysRoleService.fetchBySid(roleSid).getType();
+//            if (type == 1){
+//                orgRoleMenuQuery.setIsAdmin("1");
+//            }else {
+//                orgRoleMenuQuery.setIsAdmin("0");
+//            }
+//        }
+//        orgRoleMenuQuery.setRoleSids(roleSids);
+//        orgRoleMenuQuery.setSourceSid(query.getSourceSid());
+//        list = sysMenuRoleService.getSourceMenuTreeOfRoles(orgRoleMenuQuery, null);
+//        return rb.success().setData(list);
+//    }
     @ApiOperation("根据资源sid查询所有数据列表 ")
     @PostMapping("/sourcemenutree")
     public ResultBean<List<Map<String, Object>>> sourcemenutree(@RequestBody SysMenuQuery query) {
@@ -100,20 +125,42 @@ public class CyfSysMenuRest {
         //if业务角色存在，则查询业务角色的菜单列表，否则查询平台角色的菜单列表
         List<SysUserRoleVo> userRole = sysUserRoleService.selectByUserSid(query.getUserSid());
         List<String> roleSids = userRole.stream().map(s -> s.getRoleSid()).collect(Collectors.toList());
-        for (String roleSid : roleSids) {
-            Integer type = sysRoleService.fetchBySid(roleSid).getType();
-            if (type == 1){
-                orgRoleMenuQuery.setIsAdmin("1");
-            }else {
-                orgRoleMenuQuery.setIsAdmin("0");
-            }
-        }
+//        for (String roleSid : roleSids) {
+//            Integer type = sysRoleService.fetchBySid(roleSid).getType();
+//            if (type == 1){
+//                orgRoleMenuQuery.setIsAdmin("1");
+//            }else {
+//                orgRoleMenuQuery.setIsAdmin("0");
+//            }
+//        }
         orgRoleMenuQuery.setRoleSids(roleSids);
-        orgRoleMenuQuery.setSourceSid(query.getSourceSid());
+        //orgRoleMenuQuery.setSourceSid(query.getSourceSid());
         list = sysMenuRoleService.getSourceMenuTreeOfRoles(orgRoleMenuQuery, null);
         return rb.success().setData(list);
     }
 
+//    @ApiOperation("根据角色sid条件查询所有数据列表")
+//    @PostMapping("/listAllByRoleSid")
+//    public ResultBean<List<SysMenuVo>> listAllByRoleSid(@RequestBody SysMenuQuery query) {
+//        ResultBean rb = ResultBean.fireFail();
+//        String roleSid = query.getRoleSid();
+//        if (StringUtils.isBlank(roleSid)) {
+//            ResultBean<List<SysMenuVo>> resultBean = new ResultBean<List<SysMenuVo>>();
+//            return resultBean.fail().setMessage("角色sid不能为空!");
+//        }
+//        List<SysSourceVo> sysSourceVos = sysSourceService.listVo();
+//        List<SysMenuVo> list = new ArrayList<>();
+//        for (SysSourceVo s : sysSourceVos) {
+//            SysMenuVo sysMenuVo = new SysMenuVo();
+//            sysMenuVo.setName(s.getSourceName());
+//            sysMenuVo.setSid(s.getSid());
+//            sysMenuVo.setChecked("1");
+//            query.setSourceSid(s.getSid());
+//            sysMenuVo.setChildren(sysMenuService.listAllByRoleSid(query));
+//            list.add(sysMenuVo);
+//        }
+//        return rb.success().setData(list);
+//    }
     @ApiOperation("根据角色sid条件查询所有数据列表")
     @PostMapping("/listAllByRoleSid")
     public ResultBean<List<SysMenuVo>> listAllByRoleSid(@RequestBody SysMenuQuery query) {
@@ -123,20 +170,18 @@ public class CyfSysMenuRest {
             ResultBean<List<SysMenuVo>> resultBean = new ResultBean<List<SysMenuVo>>();
             return resultBean.fail().setMessage("角色sid不能为空!");
         }
-        List<SysSourceVo> sysSourceVos = sysSourceService.listVo();
         List<SysMenuVo> list = new ArrayList<>();
-        for (SysSourceVo s : sysSourceVos) {
-            SysMenuVo sysMenuVo = new SysMenuVo();
-            sysMenuVo.setName(s.getSourceName());
-            sysMenuVo.setSid(s.getSid());
-            sysMenuVo.setChecked("1");
-            query.setSourceSid(s.getSid());
-            sysMenuVo.setChildren(sysMenuService.listAllByRoleSid(query));
-            list.add(sysMenuVo);
-        }
+//        for (SysSourceVo s : sysSourceVos) {
+//            SysMenuVo sysMenuVo = new SysMenuVo();
+//            sysMenuVo.setName(s.getSourceName());
+//            sysMenuVo.setSid(s.getSid());
+//            sysMenuVo.setChecked("1");
+//            query.setSourceSid(s.getSid());
+            list=sysMenuService.listAllByRoleSid(query);
+            //list.add(sysMenuVo);
+//        }
         return rb.success().setData(list);
     }
-
     @ApiOperation("所有数据列表")
     @GetMapping("/list")
     public ResultBean<List<SysMenuVo>> list() {
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/sysuser/CyfSysUserMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/sysuser/CyfSysUserMapper.xml
index 5f7246b1..9bda1f34 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/sysuser/CyfSysUserMapper.xml
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/sysuser/CyfSysUserMapper.xml
@@ -110,14 +110,20 @@
             ${ew.sqlSegment}
         </where>
     </select>
+<!--    <select id="selectByUserName" resultType="com.yxt.supervise.cyf.api.sysuser.SysUser">-->
+<!--        SELECT su.*-->
+<!--        FROM sys_user su-->
+<!--                 left join sys_staffinfo si on si.sid = su.staffSid-->
+<!--        where su.userName = #{param1}-->
+<!--          and su.isDelete = 0-->
+<!--          and su.userType = 1-->
+<!--          and si.personTypeKey != '01'-->
+<!--    </select>-->
     <select id="selectByUserName" resultType="com.yxt.supervise.cyf.api.sysuser.SysUser">
         SELECT su.*
         FROM sys_user su
                  left join sys_staffinfo si on si.sid = su.staffSid
         where su.userName = #{param1}
-          and su.isDelete = 0
-          and su.userType = 1
-          and si.personTypeKey != '01'
     </select>
     <select id="selectByUserNameApp" resultType="com.yxt.supervise.cyf.api.sysuser.SysUser">
         SELECT su.*
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/sysuser/CyfSysUserRest.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/sysuser/CyfSysUserRest.java
index c43773c2..eb768424 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/sysuser/CyfSysUserRest.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/sysuser/CyfSysUserRest.java
@@ -62,10 +62,10 @@ public class CyfSysUserRest {
     @ApiOperation("登录")
     @PostMapping("/doLogin")
     public ResultBean doLogin(@RequestBody SysUser user) {
-        ResultBean rb =new ResultBean();
-        SysUserVo sysUserVo=sysUserService.getUser(user.getUserName(), user.getPassword());
-        if(sysUserVo.getUserName().equals("1")){
-            SysUser sysUser=sysUserService.getSysUser(user.getUserName(), user.getPassword());
+        ResultBean rb = new ResultBean();
+        SysUserVo sysUserVo = sysUserService.getUser(user.getUserName(), user.getPassword());
+        if (sysUserVo.getUserName().equals("1")) {
+            SysUser sysUser = sysUserService.getSysUser(user.getUserName(), user.getPassword());
             StpUtil.login(sysUser.getId());
             SaTokenInfo tokenInfo = StpUtil.getTokenInfo();
             System.out.println(StpUtil.getTokenName());
@@ -80,22 +80,25 @@ public class CyfSysUserRest {
 
     /**
      * 注销
+     *
      * @return
      */
     @ApiOperation("退出登录")
     @RequestMapping("/signOut")
     public ResultBean logout() {
-        ResultBean rb =new ResultBean();
+        ResultBean rb = new ResultBean();
         StpUtil.logout();
         return rb.setMsg("退出成功");
     }
+
     @ApiOperation("根据id查询用户和角色信息")
     @GetMapping("/getUserById/{id}")
-    public ResultBean getUserById(@PathVariable String  id) {
-        ResultBean rb=new ResultBean();
-        SysUserVo sysUser=sysUserService.getUserById(id);
+    public ResultBean getUserById(@PathVariable String id) {
+        ResultBean rb = new ResultBean();
+        SysUserVo sysUser = sysUserService.getUserById(id);
         return rb.success().setData(sysUser);
     }
+
     @ApiOperation("根据条件分页查询数据的列表 ")
     @PostMapping("/listPage")
     public ResultBean<PagerVo<SysUserVo>> listPage(@RequestBody PagerQuery<SysUserQuery> pq) {
@@ -505,6 +508,24 @@ public class CyfSysUserRest {
         return rb.success().setData(vo);
     }
 
+    //    @PostMapping(value = "/loginDetails", headers = "token")
+//    @ApiOperation("根据token值获取登录后的用户信息")
+//    public ResultBean<SysUserVo> loginDetails(HttpServletRequest httpServletRequest) {
+//        String token = httpServletRequest.getHeader("token");
+//        if (StringUtils.isBlank(token)) {
+//            return new ResultBean<SysUserVo>().fail().setMsg("请重新登录");
+//        }
+//        String userName = redisUtil.get(token);
+//        if (StringUtils.isBlank(userName)) {
+//            return new ResultBean<SysUserVo>().fail().setMsg("请重新登录");
+//        }
+//        SysUser user = sysUserService.selectByUserName(userName);
+//        SysUserVo userInfoOneVo = sysUserService.selectUserOne(user);
+//        if (userInfoOneVo == null) {
+//            return new ResultBean<SysUserVo>().fail().setMsg("该用户不是公司员工");
+//        }
+//        return new ResultBean<SysUserVo>().success().setData(userInfoOneVo);
+//    }
     @PostMapping(value = "/loginDetails", headers = "token")
     @ApiOperation("根据token值获取登录后的用户信息")
     public ResultBean<SysUserVo> loginDetails(HttpServletRequest httpServletRequest) {
@@ -512,12 +533,13 @@ public class CyfSysUserRest {
         if (StringUtils.isBlank(token)) {
             return new ResultBean<SysUserVo>().fail().setMsg("请重新登录");
         }
-        String userName = redisUtil.get(token);
-        if (StringUtils.isBlank(userName)) {
+        String id = StpUtil.getLoginIdAsString();
+        SysUser sysUser=sysUserService.getUserByUserId(id);
+        if (StringUtils.isBlank(sysUser.getUserName())) {
             return new ResultBean<SysUserVo>().fail().setMsg("请重新登录");
         }
-        SysUser user = sysUserService.selectByUserName(userName);
-        SysUserVo userInfoOneVo = sysUserService.selectUserOne(user);
+        SysUser user = sysUserService.selectByUserName(sysUser.getUserName());
+        SysUserVo userInfoOneVo = sysUserService.selectUsersOne(user);
         if (userInfoOneVo == null) {
             return new ResultBean<SysUserVo>().fail().setMsg("该用户不是公司员工");
         }
@@ -558,7 +580,7 @@ public class CyfSysUserRest {
     @GetMapping("/selectUserInfoByUserSid/{userSid}/{orgSid}")
     public ResultBean<SysUserInfoVo> selectUserInfoByUserSid(String userSid, String orgSid) {
         ResultBean<SysUserInfoVo> rb = ResultBean.fireFail();
-        SysUserInfoVo sysUserInfoVo = sysUserService.selectUserInfoByUserSid(userSid,orgSid);
+        SysUserInfoVo sysUserInfoVo = sysUserService.selectUserInfoByUserSid(userSid, orgSid);
         if (sysUserInfoVo == null) {
             return rb.setData(new SysUserInfoVo()).setMsg("该用户未设置所属部门");
         }
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/sysuser/CyfSysUserService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/sysuser/CyfSysUserService.java
index 3fd43f8c..d72bdc1a 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/sysuser/CyfSysUserService.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/sysuser/CyfSysUserService.java
@@ -412,7 +412,112 @@ public class CyfSysUserService extends MybatisBaseService<CyfSysUserMapper, SysU
         userInfoOneVo.setOrgList(orgList);
         return userInfoOneVo;
     }
+    public SysUserVo selectUsersOne(SysUser user) {
+        // 根据用户信息查询用户的角色信息
+        SysUserVo userInfoOneVo = new SysUserVo();
+        userInfoOneVo.setToken(user.getToken());
+        userInfoOneVo.setId(user.getId());
+        userInfoOneVo.setSid(user.getSid());
+        userInfoOneVo.setUserName(user.getUserName());
+        userInfoOneVo.setIsAdmin(user.getIsAdmin());
+        //类型为员工的组织机构信息
+//        SysStaffOrg sysStaffOrg = sysStaffOrgService.selectAllByStaffSid(user.getStaffSid()).getData();
+//        if (sysStaffOrg == null) {
+//            return null;
+//        }
 
+        userInfoOneVo.setRoleName("");
+        String dwjb = "";
+        userInfoOneVo.setName("系统管理员");
+        userInfoOneVo.setMobile("");
+        userInfoOneVo.setStaffSid("");
+        userInfoOneVo.setOrganizationName("无单位");
+        userInfoOneVo.setDepartmentName("无部门");
+        // 系统管理员（没有对应的人员和单位）
+        //是否是管理员：1管理员，2一般用户，0是超级管理员,3尚无单位人员
+//        if ("0".equals(user.getIsAdmin())) {
+//            userInfoOneVo.setName("系统管理员");
+//            userInfoOneVo.setMobile("");
+//            userInfoOneVo.setStaffSid("");
+//            userInfoOneVo.setOrganizationName("无单位");
+//            userInfoOneVo.setDepartmentName("无部门");
+//        } else {
+//            // 获取人员姓名
+//            SysStaffinfo staffVo = sysStaffinfoService.fetchBySid(user.getStaffSid());
+//            if (null != staffVo) {
+//                userInfoOneVo.setName(staffVo.getName());
+//                userInfoOneVo.setMobile(staffVo.getMobile());
+//                userInfoOneVo.setStaffSid(staffVo.getSid());
+////                userInfoOneVo.setOrgNamePath(sysStaffOrg.getOrgNamePath());
+////                userInfoOneVo.setOrgSidPath(sysStaffOrg.getOrgSidPath());
+//
+//            }
+//            // 尚无单位人员，没有单位和部门信息
+//            if ("3".equals(user.getIsAdmin())) {
+//                userInfoOneVo.setOrganizationName("无单位");
+//                userInfoOneVo.setDepartmentName("无部门");
+//            } else {
+//                userInfoOneVo.setOrganizationName("无单位");
+//                userInfoOneVo.setDepartmentName("无部门");
+//                List<SysStaffOrgVo> orgVoList = sysStaffOrgService.getSysStaffOrgListByStaff(user.getStaffSid());
+//                SysStaffPostDetailsVo staffPostDetailsVo = sysStaffPostService.getPostByStaffSid(user.getStaffSid());
+//                userInfoOneVo.setPostSid(staffPostDetailsVo.getPostSid());
+//                userInfoOneVo.setPostName(staffPostDetailsVo.getName());
+//                if (orgVoList.size() > 0) {
+//                    //类型为员工的组织机构信息
+//                    SysStaffOrgVo sysStaffOrgVo = orgVoList.get(0);
+//                    userInfoOneVo.setDepartmentName(sysStaffOrgVo.getOrgName());
+//                    userInfoOneVo.setDepartmentSid(sysStaffOrgVo.getOrgSid());
+//                    SysOrganization sysOrganizationOne = sysOrganizationService.fetchBySid(sysStaffOrgVo.getOrgSid());
+//                    if (sysOrganizationOne != null) {
+//                        String psid = sysOrganizationOne.getPsid();
+//                        String name = sysOrganizationService.fetchBySid(psid).getName();
+//                        userInfoOneVo.setPNameAndDepartmentNameAndPostName(name + "-" + sysStaffOrgVo.getOrgName());
+//                    }
+//                    userInfoOneVo.setOrganizationSid(sysStaffOrgVo.getOrgSid());
+//                    userInfoOneVo.setOrganizationName(sysStaffOrgVo.getOrgName());
+//                    userInfoOneVo.setOrgNamePath(sysStaffOrg.getOrgNamePath());
+//                    userInfoOneVo.setOrgSidPath(sysStaffOrg.getOrgSidPath());
+//                    //根据orgSidPath查询分公司sid=====
+//                    userInfoOneVo.setDefaultOrgPath(sysStaffOrg.getOrgSidPath());
+//                    userInfoOneVo.setDefaultOrgPathName(sysStaffOrg.getOrgNamePath());
+//                   /* String orgSid = sysStaffOrgService.getOrgByOrgSid(sysStaffOrgVo.getOrgSid());
+//                    SysOrganization sysOrganization = sysOrganizationService.fetchBySid(orgSid);
+//                    if (sysOrganization != null) {
+//                        userInfoOneVo.setDefaultOrgPathName(sysOrganization.getName());
+//                        userInfoOneVo.setDefaultOrgPath(sysOrganization.getSid());
+//                    } else {
+//                        userInfoOneVo.setDefaultOrgPathName("暂无组织机构");
+//                    }*/
+//                }
+//            }
+//        }
+        // 设置用户的角色sids
+        List<String> roleSids = this.getUserRoleSids(user.getSid());
+        userInfoOneVo.setRoleSids(roleSids);
+        String roleName = sysRoleService.selectByUserSid(user.getSid());
+        userInfoOneVo.setRoleName(roleName);
+//        List<SysStaffOrgVo> sysStaffOrgVos = sysStaffOrgService.selectByStaffS(user.getStaffSid());
+        List<OrgList> orgList = new ArrayList<>();
+//        if (sysStaffOrgVos.size() > 0) {
+//            for (SysStaffOrgVo vv : sysStaffOrgVos) {
+//                OrgList orgList1 = new OrgList();
+//                /*String orgSid = sysStaffOrgService.getOrgByOrgSid(vv.getOrgSid());
+//                SysOrganization sysOrganization = sysOrganizationService.fetchBySid(orgSid);
+//                if (sysOrganization != null) {
+//                    orgList1.setOrgName(sysOrganization.getName());
+//                    orgList1.setOrgPath(sysOrganization.getSid());
+//                } else {
+//                    continue;
+//                }*/
+//                orgList1.setOrgPath(vv.getOrgSidPath());
+//                orgList1.setOrgName(vv.getOrgNamePath());
+//                orgList.add(orgList1);
+//            }
+//        }
+        userInfoOneVo.setOrgList(orgList);
+        return userInfoOneVo;
+    }
     /**
      * 手机端登录后设置token
      *
@@ -1129,4 +1234,7 @@ public class CyfSysUserService extends MybatisBaseService<CyfSysUserMapper, SysU
     public List<String> getPost(String staffSid) {
         return sysStaffPostService.getPost(staffSid);
     }
+    public SysUser getUserByUserId(String id){
+        return baseMapper.selectOne(new QueryWrapper<SysUser>().eq("id",id));
+    }
 }