From 1ab659a5965c4e3e44cb626d1df0d43def48066b Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 20 Oct 2022 14:03:07 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E6=9C=BA=E6=9E=84=E5=AD=98=E6=94=BE=E5=9C=B0=E7=82=B9=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=E8=B0=83=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxt/anrui/flowable/biz/flow/FlowableRest.java | 1 + .../anrui/portal/api/sysuser/SysUserFeign.java | 5 +++++ .../portal/api/sysuser/SysUserFeignFallback.java | 5 +++++ .../anrui/portal/biz/sysuser/SysUserMapper.java | 1 + .../anrui/portal/biz/sysuser/SysUserMapper.xml | 11 +++++++++++ .../yxt/anrui/portal/biz/sysuser/SysUserRest.java | 10 ++++++++++ .../anrui/portal/biz/sysuser/SysUserService.java | 15 ++++++++++++--- .../ScmVehicleEnterlibraryService.java | 2 +- 8 files changed, 46 insertions(+), 4 deletions(-) diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java index 235d39fe54..7fd3508fc7 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java @@ -343,6 +343,7 @@ public class FlowableRest implements FlowableFeign { UserQuery userQuery = new UserQuery(); userQuery.setRoleSid(roleSid); userQuery.setOrgSidPath(dto.getOrgSidPath()); + userQuery.setOrgPath(dto.getOrgPath()); List sysUserVos = sysUserFeign.getUserByRole(userQuery).getData(); sysUserVoLists.addAll(sysUserVos); } diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java index 0edc2c4fd5..19e3f08e85 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java @@ -180,6 +180,11 @@ public interface SysUserFeign { @GetMapping("/selectUserInfoByUserSid/{userSid}") public ResultBean selectUserInfoByUserSid(@PathVariable("userSid") String userSid); + @ApiOperation(value = "根据用户的sid查询用户的组织信息") + @ResponseBody + @GetMapping("/selectUserInfoByUserSid/{userSid}/{orgSid}") + public ResultBean selectUserInfoByUserSid(@PathVariable("userSid") String userSid,@PathVariable("orgSid") String orgSid); + @PostMapping("/setIsEnable/{sid}/{isEnable}") @ResponseBody @ApiOperation(value = "设置是否可用：isEnable：1可用，0不可用") diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java index 4702c693e7..a021f1fcf0 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java @@ -165,6 +165,11 @@ public class SysUserFeignFallback implements SysUserFeign { return rb.setMsg("接口anrui_portal/sysuser/selectUserInfoByUserSid无法访问"); } + @Override + public ResultBean selectUserInfoByUserSid(String userSid, String orgSid) { + return null; + } + @Override public ResultBean setIsEnable(String sid, String isEnable) { return null; diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java index 5193875ffa..d4140a5b52 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java @@ -127,6 +127,7 @@ public interface SysUserMapper extends BaseMapper { * @return */ SysUserInfoVo selectUserInfoByUserSid(String userSid); + SysUserInfoVo selectUserInfoByUserSidOne(@Param("userSid") String userSid,@Param("orgSid") String orgSid); /** * 根据员工sid更新用户的工号以及手机号 diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml index 6d9028c956..57d9a8a754 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml @@ -182,6 +182,17 @@ ORDER BY sso.id LIMIT 1 + + update sys_user diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java index 93c2d5eda1..3e5428b7ca 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java @@ -571,6 +571,16 @@ public class SysUserRest implements SysUserFeign { return rb.success().setData(sysUserInfoVo); } + @Override + public ResultBean selectUserInfoByUserSid(String userSid, String orgSid) { + ResultBean rb = ResultBean.fireFail(); + SysUserInfoVo sysUserInfoVo = sysUserService.selectUserInfoByUserSid(userSid,orgSid); + if (sysUserInfoVo == null) { + return rb.setData(new SysUserInfoVo()).setMsg("该用户未设置所属部门"); + } + return rb.success().setData(sysUserInfoVo); + } + @Override public ResultBean setIsEnable(String sid, String isEnable) { SysUser sysUser = sysUserService.fetchBySid(sid); diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java index abef054bda..b1dfc00dee 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java @@ -887,7 +887,16 @@ public class SysUserService extends MybatisBaseService { */ public SysUserInfoVo selectUserInfoByUserSid(String userSid) { return baseMapper.selectUserInfoByUserSid(userSid); + } + /** + * 根据用户sid获取用户的组织信息 + * + * @param userSid 用户的sid + * @return + */ + public SysUserInfoVo selectUserInfoByUserSid(String userSid,String orgSid) { + return baseMapper.selectUserInfoByUserSidOne(userSid,orgSid); } /** @@ -968,10 +977,10 @@ public class SysUserService extends MybatisBaseService { if (StringUtils.isBlank(query.getRoleSid())) { return rb.setMsg("角色sid不能为空"); } - if (StringUtils.isBlank(query.getOrgSidPath())) { - return rb.setMsg("机构全路径不能为空"); - } if(StringUtils.isBlank(query.getOrgPath())){ + if (StringUtils.isBlank(query.getOrgSidPath())) { + return rb.setMsg("机构全路径不能为空"); + } //根据角色sid获取角色的层级 String levelTypeKey = sysRoleService.getLevelType(query.getRoleSid()); if (StringUtils.isNotBlank(levelTypeKey)) { diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java index c04f49780c..6852e223ad 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java @@ -405,7 +405,7 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService sysUserInfoVoResultBean = sysUserFeign.selectUserInfoByUserSid(createBySid); + ResultBean sysUserInfoVoResultBean = sysUserFeign.selectUserInfoByUserSid(createBySid,applicationDetailsVo.getUseOrgSid()); if (sysUserInfoVoResultBean.getSuccess()) { SysUserInfoVo sysUserInfoVo = sysUserInfoVoResultBean.getData(); if (sysUserInfoVo != null) {