open_platform/ss-common-user
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

11

Browse Source
This commit is contained in:
wangpengfei
2024-08-09 10:21:39 +08:00
parent 56a0073f33
commit 6442e5e2be
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

4
src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffinfoService.java
View File

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

6
src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgService.java
View File

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

6
src/main/java/com/yxt/portal/biz/sysuser/SysUserService.java
View File

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