From fcd4f86f699c120a45f25f4347bc1e0fd00c26f3 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Wed, 7 Aug 2024 16:33:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../portal/sysstafforg/SysStaffOrgFeign.java | 19 ++++++++++++++++++- .../feign/portal/sysuser/SysUserFeign.java | 11 ++++++++++- .../portal/sysuser/SysUserFeignFallback.java | 10 ++++++++++ 3 files changed, 38 insertions(+), 2 deletions(-) diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysstafforg/SysStaffOrgFeign.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysstafforg/SysStaffOrgFeign.java index a274a80..97a578f 100644 --- a/oms/src/main/java/com/yxt/oms/feign/portal/sysstafforg/SysStaffOrgFeign.java +++ b/oms/src/main/java/com/yxt/oms/feign/portal/sysstafforg/SysStaffOrgFeign.java @@ -1,10 +1,13 @@ package com.yxt.oms.feign.portal.sysstafforg; import com.yxt.common.core.result.ResultBean; +import com.yxt.oms.biz.func.sysstafforg.SysStaffOrg; import com.yxt.oms.biz.func.sysstafforg.SysStaffOrgByUserVo; +import com.yxt.oms.feign.portal.sysuser.SysStaffOrgVo; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; @@ -20,7 +23,6 @@ import java.util.List; name = "ss-common-portal", path = "/apiadmin/sysstafforg") public interface SysStaffOrgFeign { - @GetMapping("/getOrgSidByPath") @ResponseBody @ApiOperation("根据用户组织全路径获取用户的分公司sid") @@ -30,4 +32,19 @@ public interface SysStaffOrgFeign { @ResponseBody @ApiOperation("根据组织全路径查询当前部门下的所有员工") public ResultBean> selAllByOrgSidPath(String orgSidPath); + + @GetMapping("/getOrgByStaffSid") + @ResponseBody + @ApiOperation("根据用户组织全路径获取用户的分公司sid") + public ResultBean getOrgByStaffSid(@RequestParam("staffSid") String staffSid); + + @GetMapping("/getPathSidByUserSid") + @ResponseBody + @ApiOperation("根据组织全路径查询当前部门下的所有员工") + public ResultBean getPathSidByUserSid(@RequestParam(value = "userSid") String applySid); + + @ApiOperation("根据员工sid获取部门信息") + @ResponseBody + @GetMapping("/getSysStaffOrgListByStaffSid/{staffSid}") + public ResultBean> getSysStaffOrgListByStaffSid(@PathVariable("staffSid") String staffSid); } diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeign.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeign.java index 9adbaa2..71bc021 100644 --- a/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeign.java +++ b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeign.java @@ -23,7 +23,6 @@ import javax.servlet.http.HttpServletRequest; path = "/apiadmin/sysuser", fallback = SysUserFeignFallback.class) public interface SysUserFeign { - @PostMapping("/login") @ResponseBody @ApiOperation(value = "3、登录") @@ -91,4 +90,14 @@ public interface SysUserFeign { @ApiOperation("删除记录根据sid") @GetMapping("/delBySid/{sid}") public ResultBean delBySid(@PathVariable("sid") String sid); + + @ApiOperation("根据sid查询用户信息") + @PostMapping("/selectBySid") + public ResultBean selectBySid(@RequestParam("sid") String sid); + + + @ApiOperation("根据staffsid查询用户") + @ResponseBody + @GetMapping("/selectByStaffsid/{staffsid}") + public ResultBean selectByStaffsid(@PathVariable("staffsid") String staffsid); } diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeignFallback.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeignFallback.java index ba0e04a..f9bc385 100644 --- a/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeignFallback.java +++ b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeignFallback.java @@ -86,4 +86,14 @@ public class SysUserFeignFallback implements SysUserFeign { public ResultBean delBySid(String sid) { return null; } + + @Override + public ResultBean selectBySid(String sid) { + return null; + } + + @Override + public ResultBean selectByStaffsid(String staffsid) { + return null; + } }