|
@ -414,11 +414,29 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> { |
|
|
OrgList orgList1 = new OrgList(); |
|
|
OrgList orgList1 = new OrgList(); |
|
|
orgList1.setOrgPath(vv.getOrgSidPath()); |
|
|
orgList1.setOrgPath(vv.getOrgSidPath()); |
|
|
orgList1.setOrgName(vv.getOrgNamePath()); |
|
|
orgList1.setOrgName(vv.getOrgNamePath()); |
|
|
|
|
|
String orgName = ""; |
|
|
|
|
|
if (StringUtils.isNotBlank(vv.getOrgSidPath())) { |
|
|
|
|
|
String[] split = vv.getOrgSidPath().split("/"); |
|
|
|
|
|
for (int i = 0; i < split.length; i++) { |
|
|
|
|
|
//获取本级sid获取本级部门信息
|
|
|
|
|
|
SysOrganization sysOrganization = sysOrganizationService.fetchBySid(split[i]); |
|
|
|
|
|
//从本级部门信息中获取本级部门名称
|
|
|
|
|
|
if (sysOrganization != null) { |
|
|
|
|
|
String bjName = sysOrganization.getName(); |
|
|
|
|
|
if(i == 0){ |
|
|
|
|
|
orgName = bjName; |
|
|
|
|
|
}else{ |
|
|
|
|
|
orgName = orgName+"/"+bjName; |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
orgList1.setOrgName(orgName); |
|
|
|
|
|
} |
|
|
orgList.add(orgList1); |
|
|
orgList.add(orgList1); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
userInfoOneVo.setOrgList(orgList); |
|
|
userInfoOneVo.setOrgList(orgList); |
|
|
if("1".equals(isAdmin)){ |
|
|
if ("1".equals(isAdmin)) { |
|
|
userInfoOneVo.setPostName(roleName); |
|
|
userInfoOneVo.setPostName(roleName); |
|
|
} |
|
|
} |
|
|
return userInfoOneVo; |
|
|
return userInfoOneVo; |
|
|