|
|
@ -17,7 +17,6 @@ import com.yxt.anrui.portal.api.sysuser.SysUserVo; |
|
|
|
import com.yxt.anrui.portal.biz.sysstaffinfo.SysStaffinfoService; |
|
|
|
import com.yxt.anrui.portal.biz.sysstafforg.SysStaffOrgService; |
|
|
|
import com.yxt.anrui.portal.biz.sysuser.SysUserService; |
|
|
|
import com.yxt.anrui.terminal.api.base.common.FinanceVo; |
|
|
|
import com.yxt.common.base.config.RedisUtil; |
|
|
|
import com.yxt.common.base.config.component.FileUploadComponent; |
|
|
|
import com.yxt.common.base.service.MybatisBaseService; |
|
|
@ -188,7 +187,8 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa |
|
|
|
List<String> orgList = new ArrayList<>(); |
|
|
|
if (sysStaffOrgVos.size() > 0) { |
|
|
|
for (SysStaffOrgVo vv : sysStaffOrgVos) { |
|
|
|
String orgSid = sysStaffOrgService.getOrgByOrgSid(vv.getOrgSid()); |
|
|
|
// String orgSid = sysStaffOrgService.getOrgByOrgSid(vv.getOrgSid());
|
|
|
|
String orgSid = vv.getOrgSid(); |
|
|
|
SysOrganization sysOrganization = fetchBySid(orgSid); |
|
|
|
if (sysOrganization != null) { |
|
|
|
orgList.add(orgSid); |
|
|
@ -234,7 +234,8 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa |
|
|
|
List<String> orgList1 = new ArrayList<>(); |
|
|
|
if (sysStaffOrgVos1.size() > 0) { |
|
|
|
for (SysStaffOrgVo vv : sysStaffOrgVos1) { |
|
|
|
String orgSid = sysStaffOrgService.getOrgByOrgSid(vv.getOrgSid()); |
|
|
|
// String orgSid = sysStaffOrgService.getOrgByOrgSid(vv.getOrgSid());
|
|
|
|
String orgSid = vv.getOrgSid(); |
|
|
|
SysOrganization sysOrganization = fetchBySid(orgSid); |
|
|
|
if (sysOrganization != null) { |
|
|
|
orgList1.add(orgSid); |
|
|
|