From acdd6b58d205eab0ca21f34d68ddb044e935a6a8 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Wed, 8 Jun 2022 13:47:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=91=98=E5=B7=A5sid?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=88=86=E5=85=AC=E5=8F=B8sid=E3=80=81?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=94=A8=E6=88=B7sid=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=88=86=E5=85=AC=E5=8F=B8sid=E3=80=81=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E7=BB=84=E7=BB=87sid=E8=8E=B7=E5=8F=96=E5=88=86=E5=85=AC?= =?UTF-8?q?=E5=8F=B8sid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sysorganization/SysOrganizationFeign.java | 7 ++++- .../SysOrganizationFeignFallback.java | 5 ++++ .../api/sysstafforg/SysStaffOrgFeign.java | 16 ++++++++---- .../sysstafforg/SysStaffOrgFeignFallback.java | 5 ++++ .../sysorganization/SysOrganizationRest.java | 19 ++++++++++---- .../SysOrganizationService.java | 17 +++++++++--- .../biz/sysstafforg/SysStaffOrgMapper.xml | 9 ++++++- .../biz/sysstafforg/SysStaffOrgRest.java | 7 +++++ .../biz/sysstafforg/SysStaffOrgService.java | 26 +++++++++++++++++-- 9 files changed, 94 insertions(+), 17 deletions(-) diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java index 97c104c763..09baab531a 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java @@ -108,7 +108,7 @@ public interface SysOrganizationFeign { @ApiOperation("根据组织架构sid查询组织下所有分公司") @ResponseBody @GetMapping("/selectUseOrgSidBySid") - ResultBean>> selectUseOrgSidBySid(@RequestParam("sid") String sid); + ResultBean>> selectUseOrgSidBySid(@RequestParam("sid") String sid); /** * 查询公司所有的部门 @@ -124,4 +124,9 @@ public interface SysOrganizationFeign { @ResponseBody @ApiOperation("查看二维码") public ResultBean getQrCode(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid); + + @GetMapping("/getOrgSid/{sid}") + @ResponseBody + @ApiOperation("根据当前用户的所在组织获取当前用户所在的分公司") + ResultBean getOrgSid(@PathVariable(value = "sid") String sid); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java index d7b1664ffe..e60f675f02 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java @@ -127,4 +127,9 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign { public ResultBean getQrCode(String sid) { return null; } + + @Override + public ResultBean getOrgSid(String sid) { + return null; + } } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeign.java index 1f27b1d8c2..650eae74f8 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeign.java @@ -74,10 +74,6 @@ public interface SysStaffOrgFeign { @GetMapping("/getSysStaffOrgSidListByStaffSid/{staffSid}") public ResultBean getSysStaffOrgSidListByStaffSid(@PathVariable("staffSid") String staffSid); - @GetMapping("/selectSidPathByStaffSid") - @ResponseBody - @ApiModelProperty("根据员工sid获取部门全路径") - ResultBean selectSidPathByStaffSid(@RequestParam(value = "applySid") String applySid); @GetMapping("/selectAllByStaffSid") @ResponseBody @@ -92,6 +88,16 @@ public interface SysStaffOrgFeign { */ @GetMapping("/getPathSidByUserSid") @ResponseBody - @ApiModelProperty("根据员工sid获取部门全路径") + @ApiOperation("根据用户sid获取分公司sid") ResultBean getPathSidByUserSid(@RequestParam(value = "userSid") String applySid); + + @GetMapping("/selectSidPathByStaffSid") + @ResponseBody + @ApiOperation("根据人员sid获取分公司sid") + ResultBean selectSidPathByStaffSid(@RequestParam(value = "applySid") String applySid); + + @GetMapping("/getOrgSidBySid") + @ResponseBody + @ApiOperation("根据组织sid获取分公司sid") + ResultBean getOrgSidBySid(@RequestParam(value = "orgSid") String orgSid); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeignFallback.java index 6e061a13f4..1a1e9626d6 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeignFallback.java @@ -85,6 +85,11 @@ public class SysStaffOrgFeignFallback implements SysStaffOrgFeign { return null; } + @Override + public ResultBean getOrgSidBySid(String orgSid) { + return null; + } + @Override public ResultBean selectAllByStaffSid(String staffSid) { return null; 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 3fe9a7e76b..495af5ac50 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 @@ -23,8 +23,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static cn.hutool.poi.excel.sax.AttributeName.s; - /** * Project: anrui_portal(门户建设)
* File: SysOrganizationFeignFallback.java
@@ -160,11 +158,11 @@ public class SysOrganizationRest implements SysOrganizationFeign { } if (fgNames.length() > 1) { fgNames = fgNames.substring(1, fgNames.length()); - fgSids = fgSids.substring(1,fgSids.length()); + fgSids = fgSids.substring(1, fgSids.length()); } if (zgNames.length() > 1) { zgNames = zgNames.substring(1, zgNames.length()); - zgSids = zgSids.substring(1,zgSids.length()); + zgSids = zgSids.substring(1, zgSids.length()); } SysOrganizationVo vo = new SysOrganizationVo(); BeanUtil.copyProperties(entity, vo); @@ -268,7 +266,7 @@ public class SysOrganizationRest implements SysOrganizationFeign { SysOrganization sysOrganization1 = sysOrganizationService.fetchBySid(s); Integer isDept = sysOrganization1.getIsDept(); String psid = sysOrganization1.getPsid(); - if (isDept != null){ + if (isDept != null) { if (isDept == 0 && !psid.equals(0)) { qrCodeVo.setOrganizationName(sysOrganization1.getName()); break; @@ -277,4 +275,15 @@ public class SysOrganizationRest implements SysOrganizationFeign { } return new ResultBean().success().setData(qrCodeVo); } + + @Override + public ResultBean getOrgSid(String sid) { + ResultBean rb = ResultBean.fireFail(); + SysOrganization sysOrganization = sysOrganizationService.fetchBySid(sid); + if (sysOrganization == null) { + return rb.setMsg("该组织不存在"); + } + String orgSid = sysOrganizationService.getOrgSid(sid); + return rb.success().setData(orgSid); + } } 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 7185b9700a..be235647a0 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 @@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.portal.api.sysorganization.*; 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.SysUserFeign; import com.yxt.anrui.portal.biz.sysstafforg.SysStaffOrgService; import com.yxt.anrui.portal.biz.sysuser.SysUserService; import com.yxt.common.base.config.component.FileUploadComponent; @@ -377,9 +375,22 @@ public class SysOrganizationService extends MybatisBaseService> selectUseOrgSidBySid(String sid) { + public List> selectUseOrgSidBySid(String sid) { SysOrganization sysOrganization = fetchBySid(sid); String psid = sysOrganization.getPsid(); return baseMapper.selectUseOrgSidBySid(psid); } + + public String getOrgSid(String sid) { + SysOrganization sysOrganization = fetchBySid(sid); + String orgSid = ""; + if ("0".equals(sysOrganization.getPsid())) { + orgSid = sysOrganization.getSid(); + return orgSid; + } + if ("1".equals(sysOrganization.getIsDept())) { + return sysOrganization.getSid(); + } + return getOrgSid(sid); + } } \ 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 c9fbf2f6df..f994e6fbe8 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 @@ -43,8 +43,15 @@ and sso.orgSid = #{orgSid} +