11/7

yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationService.java

@@ -203,6 +203,9 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
                             System.out.println(l);
                             UserProjectVo userProjectVo1=userProjectFeign.getSidByUserSid(projectSid,l.getSid()).getData();
                             l.setUserProjectSid(userProjectVo1.getSid());
+                            if(l.getIsOrg()=="2"){
+                                l.setOrgAllName(sysOrganizationVo1.getName());
+                            }
                             i++;
                             j++;
                             list1.add(l);
@@ -218,6 +221,7 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
                             if(t.getSid().equals(userProjectVo.getUserSid())){
                                 UserProjectVo userProjectVo2=userProjectFeign.getSidByUserSid(projectSid,userProjectVo.getUserSid()).getData();
                                 t.setUserProjectSid(userProjectVo2.getSid());
+                                t.setOrgAllName(sysOrganizationVo1.getName()+"-"+s.getName());
                                 list2.add(t);
                             }
                         }

yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationVo.java

@@ -91,4 +91,5 @@ public class SysOrganizationVo implements Vo {
     private String mobile;
     private String isOpenId;
     private String userProjectSid;
+    private String orgAllName;
 }