From e4aa9c48f2a92cf413a38b88360d5918269b6107 Mon Sep 17 00:00:00 2001 From: nies Date: Sun, 26 Sep 2021 14:07:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=BA=E5=91=98=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E5=B2=97=E4=BD=8D=E5=92=8C=E9=83=A8=E9=97=A8=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E7=9A=84=E6=98=A0=E5=B0=84=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/iservice/busi/ISysDepartmentService.java | 7 +++--- .../api/iservice/busi/ISysPositionService.java | 7 +++--- .../controller/busi/SysUserInfoController.java | 25 +++++++++++----------- .../serviceimpl/busi/SysDepartmentService.java | 7 +++--- .../serviceimpl/busi/SysPositionService.java | 7 +++--- 5 files changed, 27 insertions(+), 26 deletions(-) diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDepartmentService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDepartmentService.java index d2013f1..13b2816 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDepartmentService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDepartmentService.java @@ -110,11 +110,10 @@ public interface ISysDepartmentService extends ICrudService { SysDepartment findSysDepartmentByDepartCodeAndOrganizedId(String departmentCode,Long organizeId); /** - * 根据sysDepartment查询所有符合条件的部门信息 - * @param sysDepartment + * 查询默认条件的部门信息 * @return */ - @ApiOperation(value = "根据sysDepartment查询所有符合条件的部门信息") - List findAllByBaseBean(SysDepartment sysDepartment); + @ApiOperation(value = "查询默认条件的部门信息") + List findAllByBaseBean(); } diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysPositionService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysPositionService.java index 32d5f82..e054f8d 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysPositionService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysPositionService.java @@ -105,12 +105,11 @@ public interface ISysPositionService extends ICrudService { SysPosition findPositionByPositionCodeAndOrganizeId(String positionCode,String organizeCode); /** - * 查询符合条件的岗位信息 - * @param sysPosition bean + * 查询默认条件条件的岗位信息 * @return */ - @ApiOperation(value = "查询符合条件的岗位信息", notes = "根据SysPosition查询所有符合条件的岗位") - List findAllByBaseBean(SysPosition sysPosition); + @ApiOperation(value = "查询默认条件条件的岗位信息", notes = "查询默认条件条件的岗位信息") + List findAllByBaseBean(); /** * 根据岗位名称查询岗位信息 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 c87bd39..4c2d6db 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 @@ -488,9 +488,9 @@ public class SysUserInfoController extends CoreBaseController { ExcelTool excelTool = new ExcelTool(entityManager, redisRes); try { String filename = "userImportTemplate.xls"; - SysPosition positionBean = new SysPosition(); - positionBean.setOrganizeCode(AuthUtil.getOrganizeCode()); - List positionList = positionService.findAllByBaseBean(positionBean); +// SysPosition positionBean = new SysPosition(); +// positionBean.setOrganizeCode(AuthUtil.getOrganizeCode()); + List positionList = positionService.findAllByBaseBean(); Map positionMap = positionList.stream().collect(Collectors.toMap(position -> position.getPositionCode(), position -> position.getName(), (oldKey, newkey) -> oldKey)); Map> relatefildMap = new HashMap<>(); @@ -538,16 +538,17 @@ public class SysUserInfoController extends CoreBaseController { List userInfoList = validateAndDistinc(importModelList, faildList); //3.某些数据字段转换 - SysPosition positionBean = new SysPosition(); - String organizationCode = AuthUtil.getOrganizeCode(); - positionBean.setOrganizeCode(organizationCode); - List positionList = positionService.findAllByBaseBean(positionBean); +// SysPosition positionBean = new SysPosition(); +// String organizationCode = AuthUtil.getOrganizeCode(); +// positionBean.setOrganizeCode(organizationCode); + List positionList = positionService.findAllByBaseBean(); Map positionMap = positionList.stream().collect(Collectors.toMap(position -> position.getPositionCode(), position -> String.valueOf(position.getId()), (oldKey, newkey) -> oldKey)); - SysDepartment departmentBean = new SysDepartment(); - departmentBean.setOrganizeCode(organizationCode); - List departmentList = departmentService.findAllByBaseBean(departmentBean); +// SysDepartment departmentBean = new SysDepartment(); +// departmentBean.setOrganizeCode(organizationCode); +// List departmentList = departmentService.findAllByBaseBean(departmentBean); + List departmentList = departmentService.findAllByBaseBean(); //部门树 List departmentTree = new ArrayList<>(); //部门id的映射 @@ -608,8 +609,8 @@ public class SysUserInfoController extends CoreBaseController { } catch (Exception e) { LOGGER.error("导入人员数据出错", e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - }finally{ - if(rLock.isHeldByCurrentThread()){ + } finally { + if (rLock.isHeldByCurrentThread()) { rLock.unlock(); } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java index 6435d4c..95d9471 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java @@ -328,9 +328,10 @@ public class SysDepartmentService extends CrudService implements } @Override - public List findAllByBaseBean(SysDepartment sysDepartment) { - Example example = Example.of(sysDepartment); - return this.departmentRDao.findAll(example); + public List findAllByBaseBean() { +// Example example = Example.of(sysDepartment); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + return this.departmentRDao.findByHqlWhere(ddlPackBean); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPositionService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPositionService.java index 473d462..051701f 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPositionService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPositionService.java @@ -127,9 +127,10 @@ public class SysPositionService extends CrudService implements ISys } @Override - public List findAllByBaseBean(SysPosition sysPosition) { - Example example = Example.of(sysPosition); - return this.positionRDao.findAll(example); + public List findAllByBaseBean() { +// Example example = Example.of(sysPosition); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + return this.positionRDao.findByHqlWhere(ddlPackBean); } @Override