|
|
|
@ -121,8 +121,8 @@ public class SysOrganizationRest implements SysOrganizationFeign { |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public ResultBean<List<SysOrganizationVo>> tranThree(String sid,String deptSid) { |
|
|
|
return new ResultBean<List<SysOrganizationVo>>().success().setData(sysOrganizationService.tranThree(sid,deptSid)); |
|
|
|
public ResultBean<List<SysOrganizationVo>> tranThree(String sid, String deptSid) { |
|
|
|
return new ResultBean<List<SysOrganizationVo>>().success().setData(sysOrganizationService.tranThree(sid, deptSid)); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@ -151,12 +151,12 @@ public class SysOrganizationRest implements SysOrganizationFeign { |
|
|
|
String zgStaffSid = dto.getZgStaffSid(); |
|
|
|
//分管人员的sid
|
|
|
|
String fgStaffSid = dto.getFgStaffSid(); |
|
|
|
if(StringUtils.isNotBlank(zgStaffSid)){ |
|
|
|
if (StringUtils.isNotBlank(zgStaffSid)) { |
|
|
|
SysStaffinfo sysStaffinfo = sysStaffInfoService.fetchBySid(zgStaffSid); |
|
|
|
sysOrganization.setManagerName(sysStaffinfo.getName()); |
|
|
|
SysUserVo sysUser = sysUserService.selectByStaffsid(zgStaffSid); |
|
|
|
sysOrganization.setManagerSid(sysUser.getSid()); |
|
|
|
}else{ |
|
|
|
} else { |
|
|
|
sysOrganization.setManagerName(""); |
|
|
|
sysOrganization.setManagerSid(""); |
|
|
|
} |
|
|
|
@ -169,9 +169,9 @@ public class SysOrganizationRest implements SysOrganizationFeign { |
|
|
|
} |
|
|
|
} |
|
|
|
//查询所有该orgSid的staffSid的类型为员工的
|
|
|
|
List<SysStaffOrg> staffList = sysStaffOrgService.selectStaffByOrgSid(sid,"3"); |
|
|
|
List<SysStaffOrg> staffList = sysStaffOrgService.selectStaffByOrgSid(sid, "3"); |
|
|
|
staffList.removeAll(Collections.singleton(null)); |
|
|
|
if(!staffList.isEmpty()){ |
|
|
|
if (!staffList.isEmpty()) { |
|
|
|
//更新关联表中的orgName和orgNamePath以及orgSidPath
|
|
|
|
//查询该部门的全部信息
|
|
|
|
ResultBean resultBean = sysOrganizationService.updateStaffList(sysOrganization); |
|
|
|
@ -198,15 +198,15 @@ public class SysOrganizationRest implements SysOrganizationFeign { |
|
|
|
//查询分管人员
|
|
|
|
List<String> stringList1 = new ArrayList<>(); |
|
|
|
List<String> reduce1 = new ArrayList<>(); |
|
|
|
if(StringUtils.isNotBlank(fgStaffSid)){ |
|
|
|
if (StringUtils.isNotBlank(fgStaffSid)) { |
|
|
|
stringList1 = Arrays.asList(fgStaffSid.split(",")); |
|
|
|
reduce1 = stringList1.stream().filter(item -> !stringList.contains(item)).collect(toList()); |
|
|
|
}else{ |
|
|
|
} else { |
|
|
|
reduce1 = stringList; |
|
|
|
} |
|
|
|
String orgSid1 = sysStaffOrgService.getOrgByOrgSid(sid); |
|
|
|
if(reduce1.size()>0){ |
|
|
|
for (String s : reduce1){ |
|
|
|
if (reduce1.size() > 0) { |
|
|
|
for (String s : reduce1) { |
|
|
|
//查询该人员的组织机构list
|
|
|
|
List<SysStaffOrgVo> sysStaffOrgVos = sysStaffOrgService.selectByStaffS(s); |
|
|
|
List<String> orgList = new ArrayList<>(); |
|
|
|
@ -221,10 +221,10 @@ public class SysOrganizationRest implements SysOrganizationFeign { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
if(!orgList.contains(orgSid1)){ |
|
|
|
if (!orgList.contains(orgSid1)) { |
|
|
|
//根据staffSid查询token
|
|
|
|
String token = sysUserService.selectByStaffsid(s).getToken(); |
|
|
|
if(StringUtils.isNotBlank(token)){ |
|
|
|
if (StringUtils.isNotBlank(token)) { |
|
|
|
//清空该token
|
|
|
|
redisUtil.remove(token); |
|
|
|
} |
|
|
|
@ -293,7 +293,7 @@ public class SysOrganizationRest implements SysOrganizationFeign { |
|
|
|
vo.setFgStaffSid(fgSids); |
|
|
|
|
|
|
|
SysUser sysUser = sysUserService.fetchBySid(entity.getManagerSid()); |
|
|
|
if(sysUser != null){ |
|
|
|
if (sysUser != null) { |
|
|
|
vo.setZgStaffSid(sysUser.getStaffSid()); |
|
|
|
vo.setZgNames(entity.getManagerName()); |
|
|
|
} |
|
|
|
@ -319,6 +319,22 @@ public class SysOrganizationRest implements SysOrganizationFeign { |
|
|
|
return new ResultBean<Map<String, Object>>().success().setData(map); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public ResultBean<Map<String, Object>> selectAppOrganization2(String sid) { |
|
|
|
Map<String, Object> map = new HashMap<>(); |
|
|
|
List<Map<String, Object>> nameList = sysOrganizationService.selectOrgNameList(sid); |
|
|
|
List<OaSysOrganizationVo> list = null; |
|
|
|
if (StringUtils.isBlank(sid)) { // 组织架构
|
|
|
|
list = sysOrganizationService.selectAppOrganization2(); |
|
|
|
} else { // 组织架构子集
|
|
|
|
list = sysOrganizationService.selectAppOrganizationSub2(sid); |
|
|
|
|
|
|
|
} |
|
|
|
map.put("nameList", nameList); |
|
|
|
map.put("list", list); |
|
|
|
return new ResultBean<Map<String, Object>>().success().setData(map); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public ResultBean<List<SysOrgVo>> selectListOrg() { |
|
|
|
ResultBean<List<SysOrgVo>> rb = ResultBean.fireFail(); |
|
|
|
@ -340,12 +356,12 @@ public class SysOrganizationRest implements SysOrganizationFeign { |
|
|
|
|
|
|
|
@Override |
|
|
|
public ResultBean<List<SysOrgVo>> getListOrgByBrandSid(String orgSid, String brandSid) { |
|
|
|
return sysOrganizationService.getListOrgByBrandSid(orgSid,brandSid); |
|
|
|
return sysOrganizationService.getListOrgByBrandSid(orgSid, brandSid); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public ResultBean<List<SysOrgVo>> getListOrgByBrandSidNo(String orgSid, String brandSid) { |
|
|
|
return sysOrganizationService.getListOrgByBrandSidNo(orgSid,brandSid); |
|
|
|
return sysOrganizationService.getListOrgByBrandSidNo(orgSid, brandSid); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@ -451,7 +467,7 @@ public class SysOrganizationRest implements SysOrganizationFeign { |
|
|
|
|
|
|
|
@Override |
|
|
|
public ResultBean<SysOrganizationVo> selectByPSid(String sid, String name) { |
|
|
|
return sysOrganizationService.selectByPSid(sid,name); |
|
|
|
return sysOrganizationService.selectByPSid(sid, name); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@ -482,7 +498,7 @@ public class SysOrganizationRest implements SysOrganizationFeign { |
|
|
|
public ResultBean<List<SysFinanceVo>> selectFinance(String orgPath, String userSid) { |
|
|
|
ResultBean<List<SysFinanceVo>> rb = ResultBean.fireFail(); |
|
|
|
String useOrgSid = sysStaffOrgService.getOrgSidByPath(orgPath).getData(); |
|
|
|
List<SysFinanceVo> list = sysOrganizationService.selectBy("金融服务部",useOrgSid); |
|
|
|
List<SysFinanceVo> list = sysOrganizationService.selectBy("金融服务部", useOrgSid); |
|
|
|
list.removeAll(Collections.singleton(null)); |
|
|
|
list = list.stream().filter(v -> StringUtils.isNotBlank(v.getUserSid())).collect(toList()); |
|
|
|
return rb.success().setData(list); |
|
|
|
@ -496,7 +512,7 @@ public class SysOrganizationRest implements SysOrganizationFeign { |
|
|
|
@Override |
|
|
|
public ResultBean<List<SysOrganization>> selectByOrgCodeAndPsid(String orgCode, String pSid) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
List<SysOrganization> sysOrganization = sysOrganizationService.selectByOrgCodeAndPsid(orgCode,pSid); |
|
|
|
List<SysOrganization> sysOrganization = sysOrganizationService.selectByOrgCodeAndPsid(orgCode, pSid); |
|
|
|
return rb.success().setData(sysOrganization); |
|
|
|
} |
|
|
|
|
|
|
|
|
