diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java index aade5054c6..fc52aecfa9 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.portal.api.sysstaffinfo.*; import com.yxt.anrui.portal.api.sysstaffinfo.app.AppSysStaffQuery; import com.yxt.anrui.portal.api.sysstaffinfo.app.AppSysStaffVo; -import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.portal.biz.sysuser.SysUserService; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.utils.PagerUtil; @@ -137,9 +136,9 @@ public class SysStaffinfoRest implements SysStaffinfoFeign { } @Override - public ResultBean>> getStaffName(String staffName,String deptSid) { + public ResultBean>> getStaffName(String staffName, String deptSid) { ResultBean rb = ResultBean.fireFail(); - List> staffNameList = sysStaffinfoService.getStaffName(staffName,deptSid); + List> staffNameList = sysStaffinfoService.getStaffName(staffName, deptSid); return rb.success().setData(staffNameList); } @@ -168,22 +167,11 @@ public class SysStaffinfoRest implements SysStaffinfoFeign { if (StringUtils.isNotBlank(appContactsDetailsVo.getHeadImage())) { appContactsDetailsVo.setHeadImage(fileUploadComponent.getUrlPrefix() + appContactsDetailsVo.getHeadImage()); } - SysUserVo sysUser = sysUserService.selectByStaffsid(staffSid); - //根据用户sid查询岗位 - String isAdmin = ""; - if(sysUser != null){ - isAdmin = sysUser.getIsAdmin(); + List stringList = sysUserService.getPost(staffSid); + stringList.removeAll(Collections.singleton(null)); + if (!stringList.isEmpty()) { + appContactsDetailsVo.setPosition(String.join("|", stringList)); } - if("1".equals(isAdmin)){ - - }else{ - List stringList = sysUserService.getPost(staffSid); - stringList.removeAll(Collections.singleton(null)); - if (!stringList.isEmpty()) { - appContactsDetailsVo.setPosition(String.join("|", stringList)); - } - } - return new ResultBean().success().setData(appContactsDetailsVo); } @@ -214,12 +202,12 @@ public class SysStaffinfoRest implements SysStaffinfoFeign { @Override public ResultBean> getGressionUserList(String userSid) { - return sysStaffinfoService.getGressionUserList(userSid,""); + return sysStaffinfoService.getGressionUserList(userSid, ""); } @Override public ResultBean> getGressionUserList(String userSid, String orgPath) { - return sysStaffinfoService.getGressionUserList(userSid,orgPath); + return sysStaffinfoService.getGressionUserList(userSid, orgPath); } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/app/AppSysUserRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/app/AppSysUserRest.java index 08a6bcf76c..336badacf9 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/app/AppSysUserRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/app/AppSysUserRest.java @@ -13,6 +13,7 @@ import com.yxt.anrui.portal.api.sysuser.app.AppMySysUserInfo; import com.yxt.anrui.portal.api.sysuser.app.AppSysUserFeign; import com.yxt.anrui.portal.api.sysuser.app.MyInfoQuery; import com.yxt.anrui.portal.biz.sysexceptionlog.SysExceptionLogService; +import com.yxt.anrui.portal.biz.sysrole.SysRoleService; import com.yxt.anrui.portal.biz.systemlog.SystemLogService; import com.yxt.anrui.portal.biz.sysuser.SysUserService; import com.yxt.common.base.config.RedisUtil; @@ -50,6 +51,8 @@ public class AppSysUserRest implements AppSysUserFeign { private HttpServletRequest httpServletRequest; @Autowired private FileUploadComponent fileUploadComponent; + @Autowired + private SysRoleService sysRoleService; @Override public ResultBean login(SysUserQuery userQuery) { @@ -349,12 +352,24 @@ public class AppSysUserRest implements AppSysUserFeign { if (!strings.isEmpty()) { userInfo.setDepartment(String.join("|", strings)); } - //根据用户sid查询岗位 - List stringList = sysUserService.getPost(sysUserVo.getStaffSid()); - stringList.removeAll(Collections.singleton(null)); - if (!stringList.isEmpty()) { - userInfo.setPosition(String.join("|", stringList)); + String isAdmin = ""; + SysUser sysUser = sysUserService.fetchBySid(userSid); + if(sysUser != null){ + isAdmin = sysUser.getIsAdmin(); } + if("1".equals(isAdmin)){ + String roleName = sysRoleService.selectByUserSid(userSid); + userInfo.setPosition(roleName); + + }else{ + //根据用户sid查询岗位 + List stringList = sysUserService.getPost(sysUserVo.getStaffSid()); + stringList.removeAll(Collections.singleton(null)); + if (!stringList.isEmpty()) { + userInfo.setPosition(String.join("|", stringList)); + } + } + return new ResultBean().success().setData(userInfo); }