From 1ccdab342806c1d9cc39926bb8ed62b2e7516d2a Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Mon, 13 Feb 2023 09:53:19 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9C=BA=E6=9E=84=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E4=BF=AE=E6=94=B9=E6=97=B6=EF=BC=8C=E5=B0=86=E8=AF=A5?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E4=B8=8B=E7=9A=84=E5=91=98=E5=B7=A5=E7=9A=84?= =?UTF-8?q?=E5=85=B3=E8=81=94=E8=A1=A8=E4=B8=AD=E7=9A=84=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=BB=A5=E5=8F=8A=E9=83=A8=E9=97=A8=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E5=85=A8=E8=B7=AF=E5=BE=84=E5=92=8C=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E5=85=A8=E8=B7=AF=E5=BE=84=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SysOrganizationMapper.java | 2 + .../sysorganization/SysOrganizationMapper.xml | 23 ++++++++--- .../sysorganization/SysOrganizationRest.java | 9 +++++ .../SysOrganizationService.java | 40 ++++++++++++++----- .../biz/sysstafforg/SysStaffOrgMapper.java | 2 + .../biz/sysstafforg/SysStaffOrgMapper.xml | 4 ++ .../biz/sysstafforg/SysStaffOrgService.java | 4 ++ 7 files changed, 70 insertions(+), 14 deletions(-) diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java index 58107e5e98..2cbee9b190 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java @@ -120,4 +120,6 @@ public interface SysOrganizationMapper extends BaseMapper { List getListDeptByOrgSid(String orgSid); List selectOrgByPSid(String psid); + + int updateOrgBySid(@Param("orgSid") String sid, @Param("orgName") String orgName, @Param("orgSidPath") String orgSidPath, @Param("orgNamePath") String orgNamePath); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml index c9d43e0f57..c5153252a6 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml @@ -188,11 +188,12 @@ SELECT so.name, so.psid, so.id, so.sid, so.orgSidPath FROM sys_organization so - WHERE isDept = 0 AND so.psid = #{psid} + WHERE isDept = 0 + AND so.psid = #{psid} + + + update sys_staff_org + set orgName = #{orgName}, + orgSidPath = #{orgSidPath}, + orgNamePath = #{orgNamePath} + where orgSid = #{orgSid} + and manageType = '3' + \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java index 0a863f61ce..64b8da6da6 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import com.yxt.anrui.portal.api.sysorganization.*; import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfo; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo; import com.yxt.anrui.portal.api.sysuser.SysUser; import com.yxt.anrui.portal.api.sysuser.SysUserVo; @@ -138,6 +139,14 @@ public class SysOrganizationRest implements SysOrganizationFeign { return rb.setMsg(resultBean.getMsg()); } } + //查询所有该orgSid的staffSid的类型为员工的 + List staffList = sysStaffOrgService.selectStaffByOrgSid(sid,"3"); + staffList.removeAll(Collections.singleton(null)); + if(!staffList.isEmpty()){ + //更新关联表中的orgName和orgNamePath以及orgSidPath + //查询该部门的全部信息 + ResultBean resultBean = sysOrganizationService.updateStaffList(sysOrganization); + } sysOrganizationService.updateById(sysOrganization); //修改金蝶组织信息 /*List orgOrganizationsList = new ArrayList<>(); diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java index b547977c1a..c35e2c8716 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java @@ -227,15 +227,6 @@ public class SysOrganizationService extends MybatisBaseService sysStaffOrgVos1 = sysStaffOrgService.selectByStaffS(sid); @@ -633,4 +624,35 @@ public class SysOrganizationService extends MybatisBaseService sysOrganizationVos = baseMapper.selectOrgByPSid(psid); return rb.success().setData(sysOrganizationVos); } + + public ResultBean updateStaffList(SysOrganization entity) { + ResultBean rb = ResultBean.fireFail(); + //部门名称 + String orgName = entity.getName(); + //部门sid全路径 + String orgSidPath = entity.getOrgSidPath(); + //部门名称全路径 + String orgNamePath = ""; + if(StringUtils.isNotBlank(orgSidPath)){ + StringBuilder orgNamePath1 = new StringBuilder(); + List split = Arrays.asList(orgSidPath.split("/")); + if(split.size()>1){ + for(int i = 0;i { List selectOrgBySid(@Param("orgPath") String orgPath, @Param("staffSid") String staffSid); List getList(String staffSid); + + List selectStaffByOrgSid(@Param("orgSid") String sid, @Param("type") String type); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.xml index 5ca6083a21..63640e7b41 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.xml @@ -112,4 +112,8 @@ + + \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java index fe13b2a9e3..de2736a73c 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java @@ -308,4 +308,8 @@ public class SysStaffOrgService extends MybatisBaseService getList(String staffSid) { return baseMapper.getList(staffSid); } + + public List selectStaffByOrgSid(String sid, String type) { + return baseMapper.selectStaffByOrgSid(sid,type); + } } \ No newline at end of file