diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IPersonnelService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IPersonnelService.java index f794aef..09eaf34 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IPersonnelService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IPersonnelService.java @@ -136,6 +136,8 @@ public interface IPersonnelService { List findSysRefUserInfoDepartmentByDepartmentIdList(List departmentIdList); + List findSysDepartmentByOrganizeIdList(List organizeIdList); + @ApiOperation(value = "查询用户部门关系") List findSysUserInfoDepartmentByInfoId(Long infoId); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java index a97ab1d..6244617 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java @@ -109,13 +109,19 @@ public class SysDepartmentController extends CoreBaseController { .notNull("departmentCode", department.getDepartmentCode()) .checkNotZero("organizeId",department.getOrganizeId()); + SysDepartment sysDepartment = departmentService.getSysDepartmentById(department.getId()); + sysDepartment.setName(department.getName()); + sysDepartment.setDepartmentCode(department.getDepartmentCode()); + sysDepartment.setDepartmentSort(department.getDepartmentSort()); + sysDepartment.setParentId(department.getParentId()); + ConvertBean.modelUpdate(department, user); - if(department.getParentId() == null || department.getParentId() <= 0){ - department.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue()); - department.setParentNameRdd("顶级部门"); + if(sysDepartment.getParentId() == null || department.getParentId() <= 0){ + sysDepartment.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue()); + sysDepartment.setParentNameRdd("顶级部门"); } - departmentService.updateSysDepartment(department); + departmentService.updateSysDepartment(sysDepartment); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java index c25f392..0804218 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java @@ -106,14 +106,19 @@ public class SysPositionController extends CoreBaseController { .notNull("name", position.getName()) .notNull("positionCode", position.getPositionCode()); + SysPosition sysPosition = positionService.getSysPositionById(position.getId()); + sysPosition.setName(position.getName()); + sysPosition.setPositionCode(position.getPositionCode()); + sysPosition.setParentId(position.getParentId()); + //修改初始化 - ConvertBean.modelUpdate(position, user); - if (position.getParentId() == null || position.getParentId() <= 0) { - position.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue()); - position.setParentNameRdd("顶级岗位"); + ConvertBean.modelUpdate(sysPosition, user); + if (sysPosition.getParentId() == null || position.getParentId() <= 0) { + sysPosition.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue()); + sysPosition.setParentNameRdd("顶级岗位"); } - positionService.updateSysPosition(position); + positionService.updateSysPosition(sysPosition); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreMemTreeService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreMemTreeService.java index 2c84304..90aca8c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreMemTreeService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreMemTreeService.java @@ -399,10 +399,10 @@ public class CoreMemTreeService implements ICoreMemTreeService { // 通过组织获取部门信息 if (organizeId != null && organizeId > 0) { List organizeIdList = findSysOrganizeChildIdList(organizeId); - List refUserDepartmentList = personnelService.findSysRefUserDepartmentByOrganizeIdList(organizeIdList); - if (refUserDepartmentList != null && refUserDepartmentList.size() > 0) { - for (SysRefUserDepartment ref : refUserDepartmentList) { - refIdList.add(ref.getDepartmentId()); + List departmentList = personnelService.findSysDepartmentByOrganizeIdList(organizeIdList); + if (departmentList != null && departmentList.size() > 0) { + for (SysDepartment department : departmentList) { + refIdList.add(department.getId()); } } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java index d26c41c..d924e31 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java @@ -446,6 +446,16 @@ public class PersonnelServiceService implements IPersonnelService { } @Override + public List findSysDepartmentByOrganizeIdList(List organizeIdList) { + LOGGER.info("平台账号部门 SysRefUserInfoDepartment organizeIdList:{}", organizeIdList); + + DdlPackBean packBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getInPackList(organizeIdList,"organizeId",packBean); + + return departmentRDao.findByHqlWhere(packBean); + } + + @Override @ApiOperation(value = "查询用户部门关系") public List findSysUserInfoDepartmentByInfoId(Long infoId) { LOGGER.info("平台用户部门 SysDepartment infoId:{}", infoId); 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 22d3fd4..069f5a6 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 @@ -159,7 +159,7 @@ public class SysDepartmentService implements ISysDepartmentService { // 查询所属组织名称 LOGGER.info("组织信息 ORGANIZE organizeId:{}", department.getOrganizeId()); SysOrganize organize = organizeRDao.getById(department.getOrganizeId()); - ValidatorBean.checkNotNull(organize); + ValidatorBean.checkNotNull(organize,"不存的组织信息"); department.setOrganizeNameRdd(organize.getName()); department.setOrganizeCode(organize.getOrganizeCode());