diff --git a/src/main/java/com/yxt/portal/apiadmin/SysRoleRest.java b/src/main/java/com/yxt/portal/apiadmin/SysRoleRest.java
index 375f560..7f6a5c2 100644
--- a/src/main/java/com/yxt/portal/apiadmin/SysRoleRest.java
+++ b/src/main/java/com/yxt/portal/apiadmin/SysRoleRest.java
@@ -87,7 +87,7 @@ public class SysRoleRest {
 		if(StringUtils.isBlank(name)){
 			return new ResultBean<List<SysRoleVo>>().fail().setMsg("角色名称不能为空!");
 		}else{
-			SysRoleVo sysRoleVo = sysRoleService.fetchByName(name);
+			SysRoleVo sysRoleVo = sysRoleService.fetchByName(name,dto.getOrgSid());//org
 			if(sysRoleVo.getName()!=null){
 				return new ResultBean<List<SysRoleVo>>().fail().setMsg("角色名称不能重复!");
 			}
@@ -108,7 +108,7 @@ public class SysRoleRest {
 		if(StringUtils.isBlank(roleName)){
 			return new ResultBean<List<SysRoleVo>>().fail().setMsg("角色名称不能为空!");
 		}else{
-			SysRoleVo sysRoleVo = sysRoleService.fetchByName(roleName);
+			SysRoleVo sysRoleVo = sysRoleService.fetchByName(roleName,dto.getOrgSid());
 			if(sysRoleVo.getName()!=null&&!sid.equals(sysRoleVo.getSid())){
 				return new ResultBean<List<SysRoleVo>>().fail().setMsg("角色名称不能重复!");
 			}
diff --git a/src/main/java/com/yxt/portal/biz/sysmenu/SysMenu.java b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenu.java
index 09b219c..dcd853e 100644
--- a/src/main/java/com/yxt/portal/biz/sysmenu/SysMenu.java
+++ b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenu.java
@@ -61,4 +61,5 @@ public class SysMenu extends BaseEntity {
     
 	@ApiModelProperty("菜单类型（0左侧当行菜单，1页面中功能）")
     private String menuType;
+    private String cid;
 }
diff --git a/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuDto.java b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuDto.java
index b7b7d7c..78d7f20 100644
--- a/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuDto.java
+++ b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuDto.java
@@ -69,4 +69,5 @@ public class SysMenuDto implements Dto {
 
     @ApiModelProperty(value = "备注")
     private String remarks;
+    private String cid;
 }
\ No newline at end of file
diff --git a/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuMapper.xml b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuMapper.xml
index 2906bb6..ed68b3b 100644
--- a/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuMapper.xml
+++ b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuMapper.xml
@@ -46,7 +46,30 @@
     </update>
 
     <select id="selectChildernList" resultType="com.yxt.portal.biz.sysmenu.SysMenuTreeVo">
-        SELECT menu.*, source.sourceName, menu.pSid as menuRootSid
+        SELECT menu.NAME              AS NAME,
+               menu.sid               AS sid,
+               menu.sid               AS sid,
+               source.sid   AS sourceSid,
+               menu.sortNo            AS sortNo,
+               menu.pSid              AS pSid,
+               source.sourceName      AS sourceName,
+               menu.sid AS menuRootSid,
+               menu.menuUrl           AS menuUrl,
+               menu.iconUrl           AS iconUrl,
+               menu.pageName          AS pageName,
+               menu.pageUrlRedirect   AS pageUrlRedirect,
+               menu.pageUrl           AS pageUrl,
+               menu.remarks,
+               menu.isEnable,
+               menu.menuType as menuType,
+               case menuType
+                   when 0 then '目录'
+                   when 1 then '菜单'
+                   when 2 then '按钮'
+                   end as menuTypeValue,
+               menu.isShow,
+               menu.cId as cId,
+               (select name from sys_menu where sid=menu.pSid) as pName
         FROM sys_menu menu
                      left join sys_source source on source.sid = menu.sourceSid
         where menu.pSid = #{sid}
@@ -80,8 +103,15 @@
         menu.pageUrl           AS pageUrl,
         menu.remarks,
         menu.isEnable,
-        menu.menuType,
-        menu.isShow
+        menu.menuType as menuType,
+        case menuType
+            when 0 then '目录'
+            when 1 then '菜单'
+            when 2 then '按钮'
+        end as menuTypeValue,
+        menu.isShow,
+        menu.cId as cId,
+        (select name from sys_menu where sid=menu.pSid) as pName
         FROM sys_menu menu
         LEFT JOIN sys_source source ON menu.sourceSid = source.sid
         WHERE source.sid = #{sourceSid} AND menu.psid='0' and menu.isDelete!=1
diff --git a/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuTreeVo.java b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuTreeVo.java
index a12c33b..ecb5000 100644
--- a/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuTreeVo.java
+++ b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuTreeVo.java
@@ -56,6 +56,8 @@ public class SysMenuTreeVo implements Vo {
     private String remarks;
     private String menuType;
     private String isShow;
+    private String menuTypeValue;
+    private String cid;
     @ApiModelProperty("子菜单")
     private List<SysMenuTreeVo> children;
 }
diff --git a/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuVo.java b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuVo.java
index dd8c3bd..53ba103 100644
--- a/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuVo.java
+++ b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuVo.java
@@ -71,4 +71,5 @@ public class SysMenuVo implements Vo {
     private String checked;
     @ApiModelProperty("资源名称")
     private String sourceName;
+    private String cid;
 }
diff --git a/src/main/java/com/yxt/portal/biz/sysrole/SysRoleMapper.java b/src/main/java/com/yxt/portal/biz/sysrole/SysRoleMapper.java
index 31e7c08..58d10a4 100644
--- a/src/main/java/com/yxt/portal/biz/sysrole/SysRoleMapper.java
+++ b/src/main/java/com/yxt/portal/biz/sysrole/SysRoleMapper.java
@@ -41,7 +41,7 @@ public interface SysRoleMapper extends BaseMapper<SysRole> {
 
 	List<SysRoleVo> listAllByUserSid(@Param("userSid") String userSid,@Param("orgSid") String orgSid);
 
-	SysRole fetchByName(String name);
+	SysRole fetchByName(@Param("name")String name,@Param("orgSid") String orgSid);
 
 	int deleteBatchSids(List<String> list);
 
diff --git a/src/main/java/com/yxt/portal/biz/sysrole/SysRoleMapper.xml b/src/main/java/com/yxt/portal/biz/sysrole/SysRoleMapper.xml
index 364cdfc..dfa446a 100644
--- a/src/main/java/com/yxt/portal/biz/sysrole/SysRoleMapper.xml
+++ b/src/main/java/com/yxt/portal/biz/sysrole/SysRoleMapper.xml
@@ -16,7 +16,8 @@
         WHEN 4 THEN
         '本人数据'
         END
-        AS dataRuleValue
+        AS dataRuleValue,
+        sr.orgSid
         FROM sys_role sr
         LEFT JOIN sys_post sp ON sr.postSid = sp.sid
         <where>
@@ -50,7 +51,7 @@
     <select id="fetchByName" resultType="com.yxt.portal.biz.sysrole.SysRole">
         SELECT *
         FROM sys_role role
-        where role.name = #{param1}
+        where role.name = #{name} and role.orgSid=#{orgSid}
     </select>
     <select id="fetchBySid" resultType="com.yxt.portal.biz.sysrole.SysRoleVo">
         SELECT role.*, post.sid as postSid, post.name as postName
diff --git a/src/main/java/com/yxt/portal/biz/sysrole/SysRoleService.java b/src/main/java/com/yxt/portal/biz/sysrole/SysRoleService.java
index f79a971..c464fe6 100644
--- a/src/main/java/com/yxt/portal/biz/sysrole/SysRoleService.java
+++ b/src/main/java/com/yxt/portal/biz/sysrole/SysRoleService.java
@@ -68,7 +68,7 @@ public class SysRoleService extends MybatisBaseService<SysRoleMapper, SysRole> {
         if (query.getType() != null) {
             qw.eq("sr.type", query.getType());
         }
-        if (query.getOrgSid() != null) {
+        if (StringUtils.isNotBlank(query.getOrgSid())) {
             qw.eq("sr.orgSid", query.getOrgSid());
         }
         qw.eq("sr.isEnable","1");
@@ -114,8 +114,8 @@ public class SysRoleService extends MybatisBaseService<SysRoleMapper, SysRole> {
         return baseMapper.listAllByUserSid(userSid,orgSid);
     }
 
-    public SysRoleVo fetchByName(String name) {
-        SysRole entity = baseMapper.fetchByName(name);
+    public SysRoleVo fetchByName(String name,String orgSid) {
+        SysRole entity = baseMapper.fetchByName(name,orgSid);
         SysRoleVo vo = new SysRoleVo();
         BeanUtil.copyProperties(entity, vo);
         return vo;
diff --git a/src/main/java/com/yxt/portal/biz/sysrole/SysRoleVo.java b/src/main/java/com/yxt/portal/biz/sysrole/SysRoleVo.java
index ae76109..fc8b47b 100644
--- a/src/main/java/com/yxt/portal/biz/sysrole/SysRoleVo.java
+++ b/src/main/java/com/yxt/portal/biz/sysrole/SysRoleVo.java
@@ -46,4 +46,5 @@ public class SysRoleVo implements Vo {
     private String roleTypeValue;
     private String dataRuleId;
     private String dataRuleValue;
+    private String orgSid;
 }
diff --git a/src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffinfoService.java b/src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffinfoService.java
index 8ee0351..982ab5e 100644
--- a/src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffinfoService.java
+++ b/src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffinfoService.java
@@ -275,7 +275,7 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
      */
     public ResultBean saveStaffInfo1(SysStaffinfoDto dto) {
         ResultBean rb = ResultBean.fireFail();
-        SysRoleVo sysRoleVo = sysRoleService.fetchByName("试用期员工");
+        SysRoleVo sysRoleVo = sysRoleService.fetchByName("试用期员工","");
         if (sysRoleVo == null) {
             return rb.setMsg("缺少默认试用期员工角色");
         }
diff --git a/src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgMapper.java b/src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgMapper.java
index 892009d..cf61696 100644
--- a/src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgMapper.java
+++ b/src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgMapper.java
@@ -56,6 +56,8 @@ public interface SysStaffOrgMapper extends BaseMapper<SysStaffOrg> {
 //    @Select("select * from sys_staff_org where staffSid=#{staffSid} and manageType = '3'")
     @Select("select * from sys_staff_org where staffSid=#{staffSid}")
     List<SysStaffOrgVo> getSysStaffOrgListByStaff(@Param("staffSid") String staffSid);
+    @Select("select * from sys_staff_org where staffSid=#{staffSid} and orgSid=#{orgSid}")
+    List<SysStaffOrgVo> getSysStaffOrgListByOrg(@Param("staffSid") String staffSid,@Param("orgSid") String orgSid);
 
     /**
      * 根据员工sid更新员工信息
diff --git a/src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgService.java b/src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgService.java
index 31c5ad6..89cb4ca 100644
--- a/src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgService.java
+++ b/src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgService.java
@@ -172,7 +172,9 @@ public class SysStaffOrgService extends MybatisBaseService<SysStaffOrgMapper, Sy
     public List<SysStaffOrgVo> getSysStaffOrgListByStaff(String staffSid) {
         return baseMapper.getSysStaffOrgListByStaff(staffSid);
     }
-
+    public List<SysStaffOrgVo> getSysStaffOrgListByOrg(String staffSid,String orgSid) {
+        return baseMapper.getSysStaffOrgListByOrg(staffSid,orgSid);
+    }
     public String getSysStaffOrgSidListByStaffSid(String staffSid) {
         return baseMapper.getSysStaffOrgSidListByStaffSid(staffSid);
     }
diff --git a/src/main/java/com/yxt/portal/biz/sysuser/SysUserService.java b/src/main/java/com/yxt/portal/biz/sysuser/SysUserService.java
index 4eb3ffb..6558c0d 100644
--- a/src/main/java/com/yxt/portal/biz/sysuser/SysUserService.java
+++ b/src/main/java/com/yxt/portal/biz/sysuser/SysUserService.java
@@ -399,7 +399,8 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
             } else {
                 userInfoOneVo.setOrganizationName("无单位");
                 userInfoOneVo.setDepartmentName("无部门");
-                List<SysStaffOrgVo> orgVoList = sysStaffOrgService.getSysStaffOrgListByStaff(user.getStaffSid());
+//                List<SysStaffOrgVo> orgVoList = sysStaffOrgService.getSysStaffOrgListByStaff(user.getStaffSid());
+                List<SysStaffOrgVo> orgVoList = sysStaffOrgService.getSysStaffOrgListByOrg(user.getStaffSid(),user.getOrgSid());
                 SysStaffPostDetailsVo staffPostDetailsVo = sysStaffPostService.getPostByStaffSid(user.getStaffSid());
                 if(staffPostDetailsVo!=null){
                     userInfoOneVo.setPostSid(staffPostDetailsVo.getPostSid());
@@ -432,68 +433,7 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
                     SysOrganization sysOrganization=sysOrganizationService.getOne(new QueryWrapper<SysOrganization>().eq("sid",split.get(0)));
                     userInfoOneVo.setOrgName(sysOrganization.getName());
                     userInfoOneVo.setOrgSid(split.get(0));
-
-//                    userInfoOneVo.setOrgNamePath(sysOrganizationOne.getOrgNamePath());
                     userInfoOneVo.setOrgSidPath(sysOrganizationOne.getOrgSidPath());
-                    //根据orgSidPath查询分公司sid=====
-                    //根据用户sid查询用户是否设置了默认的组织机构
-//                    SysUserDefaultOrg sysUserDefaultOrg = sysUserDefaultOrgService.selectByUserSid(user.getSid());
-////                    if (sysUserDefaultOrg == null) {
-//                        String orgNamePath = "";
-//                        String defaultDeptName = "";
-//                        String defaultDeptSid = "";
-//                        userInfoOneVo.setDefaultOrgPath(sysOrganizationOne.getOrgSidPath());
-//                        if (StringUtils.isNotBlank(sysOrganizationOne.getOrgSidPath())) {
-//                            List<String> split = Arrays.asList(sysOrganizationOne.getOrgSidPath().split("/"));
-//                            if (split.size() > 1) {
-//                                //获取本级sid获取本级部门信息
-//                                SysOrganization sysOrganization = sysOrganizationService.fetchBySid(split.get(split.size() - 2));
-//                                SysOrganization sysOrganization1 = sysOrganizationService.fetchBySid(split.get(split.size() - 1));
-//                                orgNamePath = sysOrganization.getName() + "/" + sysOrganization1.getName();
-//                                defaultDeptName = sysOrganization1.getName();
-//                                defaultDeptSid = sysOrganization1.getSid();
-//                            } else {
-//                                SysOrganization sysOrganization = sysOrganizationService.fetchBySid(split.get(0));
-//                                orgNamePath = sysOrganization.getName();
-//                                defaultDeptName = sysOrganization.getName();
-//                                defaultDeptSid = sysOrganization.getSid();
-//                            }
-//                        }
-////                        userInfoOneVo.setDefaultOrgPathName(sysOrganizationOne.getOrgNamePath());
-//                        userInfoOneVo.setDefaultOrgPathName(orgNamePath);
-//                        userInfoOneVo.setDefaultDeptName(defaultDeptName);
-//                        userInfoOneVo.setDefaultDeptSid(defaultDeptSid);
-//                    } else {
-//                        String orgNamePath = "";
-//                        List<SysStaffOrgVo> sysStaffOrgVos = sysStaffOrgService.selectByStaffS(user.getStaffSid());
-//                        sysStaffOrgVos.removeAll(Collections.singleton(null));
-//                        List<String> orgSidPathList = sysStaffOrgVos.stream().map(v -> v.getOrgSidPath()).collect(Collectors.toList());
-//                        if (!orgSidPathList.contains(sysUserDefaultOrg.getOrgSidPath())) {
-//                            sysUserDefaultOrgService.deleteByUserSid(user.getSid());
-//                        }
-//                        userInfoOneVo.setDefaultOrgPath(sysUserDefaultOrg.getOrgSidPath());
-//                        String defaultDeptName = "";
-//                        String defaultDeptSid = "";
-//                        if (StringUtils.isNotBlank(sysUserDefaultOrg.getOrgSidPath())) {
-//                            List<String> split = Arrays.asList(sysUserDefaultOrg.getOrgSidPath().split("/"));
-//                            if (split.size() > 1) {
-//                                //获取本级sid获取本级部门信息
-//                                SysOrganization sysOrganization = sysOrganizationService.fetchBySid(split.get(split.size() - 2));
-//                                SysOrganization sysOrganization1 = sysOrganizationService.fetchBySid(split.get(split.size() - 1));
-//                                orgNamePath = sysOrganization.getName() + "/" + sysOrganization1.getName();
-//                                defaultDeptName = sysOrganization1.getName();
-//                                defaultDeptSid = sysOrganization1.getSid();
-//                            } else {
-//                                SysOrganization sysOrganization = sysOrganizationService.fetchBySid(split.get(0));
-//                                orgNamePath = sysOrganization.getName();
-//                                defaultDeptName = sysOrganization.getName();
-//                                defaultDeptSid = sysOrganization.getSid();
-//                            }
-//                        }
-//                        userInfoOneVo.setDefaultOrgPathName(orgNamePath);
-//                        userInfoOneVo.setDefaultDeptName(defaultDeptName);
-//                        userInfoOneVo.setDefaultDeptSid(defaultDeptSid);
-//                    }
                 }
             }
         }