Merge remote-tracking branch 'origin/master'

src/main/java/com/yxt/portal/apiadmin/SysStaffOrgRest.java

@@ -154,7 +154,7 @@ public class SysStaffOrgRest {
 
     @GetMapping("/selAllByOrgSidPath")
     @ResponseBody
-    @ApiOperation("根据组织全路径查询当前部门下的所有员工")
+    @ApiOperation("根据顶级sid查询当前组织下的所有员工")
     public ResultBean<List<SysStaffOrgByUserVo>> selAllByOrgSidPath(@RequestParam(value = "orgSidPath") String orgSidPath) {
         return sysStaffOrgService.selAllByOrgSidPath(orgSidPath);
     }

src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgMapper.xml

@@ -172,6 +172,6 @@
                 ON so.`staffSid` = su.`staffSid`
                      LEFT JOIN sys_staffinfo ss
                 ON so.`staffSid` = ss.`sid`
-        WHERE so.`orgSid` = #{orgSidPath}
+        WHERE su.`orgSid` = #{orgSidPath}
     </select>
 </mapper>