|
|
@ -1468,10 +1468,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl |
|
|
|
String orgPath = params.getOrgPath(); |
|
|
|
String userSid = params.getUserSid(); |
|
|
|
String useOrgSid = ""; |
|
|
|
String staffDeptSid = ""; |
|
|
|
QueryWrapper<AppFinUncollectedReceivablesDetailedVo> qw = new QueryWrapper<>(); |
|
|
|
if (params != null) { |
|
|
|
if (StringUtils.isNotBlank(orgPath)) { |
|
|
|
useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); |
|
|
|
staffDeptSid =orgPath.substring(orgPath.lastIndexOf("/") + 1); |
|
|
|
} else { |
|
|
|
useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); |
|
|
|
} |
|
|
@ -1481,6 +1483,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl |
|
|
|
if (StringUtils.isNotBlank(userSid)) { |
|
|
|
qw.eq("furd.createBySid", userSid); |
|
|
|
} |
|
|
|
if(StringUtils.isNotBlank(staffDeptSid)){ |
|
|
|
qw.eq("furd.staffDeptSid",staffDeptSid); |
|
|
|
} |
|
|
|
if (params.getSidList().size() > 0) { |
|
|
|
qw.notIn("furd.sid", params.getSidList()); |
|
|
|
} |
|
|
|