问题修改

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java

@@ -387,9 +387,24 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
                     //根据用户sid查询用户是否设置了默认的组织机构
                     SysUserDefaultOrg sysUserDefaultOrg = sysUserDefaultOrgService.selectByUserSid(user.getSid());
                     if (sysUserDefaultOrg == null) {
+                        String orgNamePath = "";
                         userInfoOneVo.setDefaultOrgPath(sysStaffOrg.getOrgSidPath());
-                        userInfoOneVo.setDefaultOrgPathName(sysStaffOrg.getOrgNamePath());
+                        if (StringUtils.isNotBlank(sysStaffOrg.getOrgSidPath())) {
+                            List<String> split = Arrays.asList(sysStaffOrg.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();
+                            } else {
+                                SysOrganization sysOrganization = sysOrganizationService.fetchBySid(split.get(0));
+                                orgNamePath = sysOrganization.getName();
+                            }
+                        }
+//                        userInfoOneVo.setDefaultOrgPathName(sysStaffOrg.getOrgNamePath());
+                        userInfoOneVo.setDefaultOrgPathName(orgNamePath);
                     } 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());
@@ -397,7 +412,19 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
                             sysUserDefaultOrgService.deleteByUserSid(user.getSid());
                         }
                         userInfoOneVo.setDefaultOrgPath(sysUserDefaultOrg.getOrgSidPath());
-                        userInfoOneVo.setDefaultOrgPathName(sysUserDefaultOrg.getOrgNamePath());
+                        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();
+                            } else {
+                                SysOrganization sysOrganization = sysOrganizationService.fetchBySid(split.get(0));
+                                orgNamePath = sysOrganization.getName();
+                            }
+                        }
+                        userInfoOneVo.setDefaultOrgPathName(orgNamePath);
                     }
                 }
             }
@@ -416,7 +443,17 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
                 orgList1.setOrgName(vv.getOrgNamePath());
                 String orgName = "";
                 if (StringUtils.isNotBlank(vv.getOrgSidPath())) {
-                    String[] split = vv.getOrgSidPath().split("/");
+                    List<String> split = Arrays.asList(vv.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));
+                        orgName = sysOrganization.getName()+"/"+sysOrganization1.getName();
+                    }else{
+                        SysOrganization sysOrganization = sysOrganizationService.fetchBySid(split.get(0));
+                        orgName = sysOrganization.getName();
+                    }
+                    /*String[] split = vv.getOrgSidPath().split("/");
                     for (int i = 0; i < split.length; i++) {
                         //获取本级sid获取本级部门信息
                         SysOrganization sysOrganization = sysOrganizationService.fetchBySid(split[i]);
@@ -429,7 +466,7 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
                                 orgName = orgName+"/"+bjName;
                             }
                         }
-                    }
+                    }*/
                     orgList1.setOrgName(orgName);
                 }
                 orgList.add(orgList1);