diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java index ae91fc465a..4235c05fe9 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java @@ -52,7 +52,8 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; -import com.yxt.anrui.portal.api.sysuser.UserQuery; +import com.yxt.anrui.portal.api.sysuser.UserRoleQuery; +import com.yxt.anrui.portal.api.sysuserrole.SysUserRoleFeign; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; @@ -96,6 +97,8 @@ public class FinCostapplyService extends MybatisBaseService listPageVo(PagerQuery pq) { FinCostapplyQuery query = pq.getParams(); @@ -266,7 +269,7 @@ public class FinCostapplyService extends MybatisBaseService sysPostVoResultBean = sysStaffPostFeign.selectPost(userVoResultBean.getData().getStaffSid()); + /* ResultBean sysPostVoResultBean = sysStaffPostFeign.selectPost(userVoResultBean.getData().getStaffSid()); if (!sysPostVoResultBean.getSuccess()) { return rb.setMsg(sysPostVoResultBean.getMsg()); } @@ -277,6 +280,23 @@ public class FinCostapplyService extends MybatisBaseService sysUserVos = sysUserFeign.getUserByRole(userQuery).getData(); sysUserVos.removeAll(Collections.singleton(null)); + if (sysUserVos.isEmpty()) { + return rb.setMsg("下一环节没有用户"); + }*/ + //根据员工的sid查询员工的角色 + String userSid = dto.getCreateBySid(); + ResultBean> userRoleList = sysUserRoleFeign.getUserRoleSidByUserSid(userSid); + UserRoleQuery userRoleQuery = new UserRoleQuery(); + if(userRoleList.getData().size()>0){ + userRoleQuery.setRoleSid(userRoleList.getData().get(0)); + } + userRoleQuery.setOrgSid(staffOrgResultBean.getData().getOrgSid()); + ResultBean> listResultBean = sysUserFeign.getUserByOrgRole(userRoleQuery); + if(!listResultBean.getSuccess()){ + return rb.setMsg(listResultBean.getMsg()); + } + List sysUserVos = listResultBean.getData(); + sysUserVos.removeAll(Collections.singleton(null)); if (sysUserVos.isEmpty()) { return rb.setMsg("下一环节没有用户"); } 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 5a39374f67..177fe25742 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 @@ -968,7 +968,7 @@ public class SysUserService extends MybatisBaseService { return rb.setMsg("角色不能为空"); } if (StringUtils.isBlank(query.getOrgSid())) { - return rb.setMsg("机构sid不能为空"); + return rb.setMsg("部门sid不能为空"); } String upRoleSid = sysRoleService.selectRoleSid(userRoleSid); sysUserVoList = baseMapper.getUserByRole(upRoleSid, query.getOrgSid());