diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserInfoService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserInfoService.java index a308345..9e4e07c 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserInfoService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserInfoService.java @@ -149,7 +149,7 @@ public interface ISysUserInfoService { * @return SysRefUserPosition */ @ApiOperation(value = "关系查询-用户岗位",notes = "查询用户岗位关系") - List findSysRefUserPositionByPositionName(String positionName); + List findSysRefUserPositionByPositionName(String positionName); /** * 根据(组织ID,部门ID,用户名称,用户工号) 查询用户信息 diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java index e4dc6cf..6b5dcaf 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java @@ -601,9 +601,9 @@ public class SysUserInfoController extends CoreBaseController { @GetMapping("/find-position-ref-user") @ApiOperation(value = "根据职位名称查询用户信息", notes = "根据职位名称查询用户信息") - public BaseResultBean findUserByPositionName(String positionName) { + public BaseResultBean findUserByPositionName(String positionName) { try { - List resultList = sysUserInfoService.findSysRefUserPositionByPositionName(positionName); + List resultList = sysUserInfoService.findSysRefUserPositionByPositionName(positionName); return new ResultBean().setSuccess(true).setResultList(resultList).build(); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java index d547771..da8bf42 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java @@ -338,22 +338,32 @@ public class SysUserInfoService implements ISysUserInfoService { } @Override - public List findSysRefUserPositionByPositionName(String positionName) { - List users = new ArrayList(); - if (StringUtils.isEmpty(positionName)) { + public List findSysRefUserPositionByPositionName(String positionName) { + List users = new ArrayList(); +// if (StringUtils.isEmpty(positionName)) { +// return users; +// } +// List positionList = positionService.findAllByPositionName(positionName); +// if (ObjectUtils.isEmpty(positionList)) { +// return users; +// } +// DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(AuthUtil.getOrganizeCode()); +// DdlPreparedPack.getInPackList( +// positionList.stream().map(el -> el.getId()).collect(Collectors.toList()), +// "positionId", +// ddlPackBean +// ); +// List refUserPositionList = refUserPositionRDao.findByHqlWhere(ddlPackBean); + if(ObjectUtils.isEmpty(positionName)){ return users; } - List positionList = positionService.findAllByPositionName(positionName); - if (ObjectUtils.isEmpty(positionList)) { - return users; - } - DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(AuthUtil.getOrganizeCode()); - DdlPreparedPack.getInPackList( - positionList.stream().map(el -> el.getId()).collect(Collectors.toList()), - "positionId", - ddlPackBean + DdlPackBean userPackBean = DdlPackBean.getDdlPackBean(AuthUtil.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack( + positionName, + "positionNameRdd", + userPackBean ); - users = refUserPositionRDao.findByHqlWhere(ddlPackBean); + users = sysUserInfoRDao.findByHqlWhere(userPackBean); return users; }