|
@ -741,7 +741,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl |
|
|
//申请部门
|
|
|
//申请部门
|
|
|
if (StringUtils.isNotBlank(dto.getOrgPath())) { |
|
|
if (StringUtils.isNotBlank(dto.getOrgPath())) { |
|
|
orgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData(); |
|
|
orgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData(); |
|
|
if (StringUtils.isBlank(deptName)) { |
|
|
|
|
|
List<String> orgList = Arrays.asList(dto.getOrgPath().split("/")); |
|
|
List<String> orgList = Arrays.asList(dto.getOrgPath().split("/")); |
|
|
String deptSid = orgList.get(orgList.size() - 1); |
|
|
String deptSid = orgList.get(orgList.size() - 1); |
|
|
ResultBean<SysOrganizationVo> organizationVoResultBean = sysOrganizationFeign.fetchBySid(deptSid); |
|
|
ResultBean<SysOrganizationVo> organizationVoResultBean = sysOrganizationFeign.fetchBySid(deptSid); |
|
@ -749,7 +748,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl |
|
|
deptName = organizationVoResultBean.getData().getName(); |
|
|
deptName = organizationVoResultBean.getData().getName(); |
|
|
createDeptSid = organizationVoResultBean.getData().getSid(); |
|
|
createDeptSid = organizationVoResultBean.getData().getSid(); |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
} else { |
|
|
} else { |
|
|
orgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData(); |
|
|
orgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData(); |
|
|
//根据staffSid获取用户的组织全路径
|
|
|
//根据staffSid获取用户的组织全路径
|
|
|