11

src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml

@@ -207,6 +207,7 @@
         SELECT DISTINCT ss.sid, ss.name
         FROM sys_staffinfo ss
                  LEFT JOIN sys_staff_org sso
+                 left join sys_organization o on o.sid =sso.orgSid
                            ON ss.`sid` = sso.`staffSid`
             ${ew.customSqlSegment}
     </select>

src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffinfoService.java

@@ -923,11 +923,15 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
 
     public List<Map<String, String>> getStaffName(String staffName,String deptSid) {
         QueryWrapper<Map<String, Object>> qw = new QueryWrapper<>();
+        SysOrganization sysOrganization=sysOrganizationService.getOne(new QueryWrapper<SysOrganization>().eq("sid",deptSid));
+        sysOrganization.setOrgSidPath(sysOrganization.getOrgSidPath()+"/");
+        String[] orgSids=sysOrganization.getOrgSidPath().split("/");
         if (StringUtils.isNotBlank(staffName)) {
             qw.like("ss.name", staffName);
         }
         qw.eq("ss.isDelete", 0);
         qw.ne("sso.orgSid", deptSid);
+        qw.like("o.orgSidPath", orgSids[0]);
 //        qw.ne("ss.personTypeKey","01");
         return baseMapper.getStaffName(qw);
     }

src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgService.java

@@ -261,9 +261,9 @@ public class SysStaffOrgService extends MybatisBaseService<SysStaffOrgMapper, Sy
         if ("0".equals(sysOrganization.getPsid())) {
             return "0";
         }
-        if (sysOrganization.getIsDept() == 0) {
+//        if (sysOrganization.getIsDept() == 0) {
-            return sysOrganization.getSid();
+//            return sysOrganization.getSid();
-        }
+//        }
         return getOrgByOrgSid(sysOrganization.getPsid());
 
     }

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

@@ -140,9 +140,9 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
 //        qw.apply("c.orgSidPath like (%"+query.getOrgSid()+")");
         qw.like("c.orgSidPath",query.getOrgSid());
 //        qw.eq("b.sourceSid",query.getSourceSid());
-//        if (StringUtils.isNotBlank(query.getName())) {
+        if (StringUtils.isNotBlank(query.getName())) {
-//            qw.like("staff.name", query.getName());
+            qw.like("staff.name", query.getName());
-//        }
+        }
 //        qw.ne("staff.personTypeKey", "01");
         return qw;
     }