From 2e6034b9011e82870622054c081899879915a6a4 Mon Sep 17 00:00:00 2001 From: zhanghua <314079846@qq.com> Date: 星期二, 18 十月 2022 16:23:36 +0800 Subject: [PATCH] 部门编辑优化 --- ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java | 30 ++++++++++++------------------ 1 files changed, 12 insertions(+), 18 deletions(-) diff --git a/ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java index 5979651..6d18845 100644 --- a/ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java +++ b/ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java @@ -86,27 +86,21 @@ @Transactional(rollbackFor = Exception.class) public void update(DepartVO.UpdateDepartVO updateDepartVO) { UmsDepart sccgDepart = this.queryByName(updateDepartVO.getDepartName()); - if (null != sccgDepart && sccgDepart.getId() != updateDepartVO.getId()) { + if (null != sccgDepart && !sccgDepart.getId().equals(updateDepartVO.getId())) { throw new ApiException(ResultCode.RECORD_ALREADY_EXISTS); } - UmsDepart depart = this.getById(updateDepartVO.getId()); + UmsDepart depart = new UmsDepart(); BeanUtils.copyProperties(updateDepartVO, depart); - List<Long> userIds = updateDepartVO.getUserIds(); - if (CollUtil.isNotEmpty(userIds)) { - Long departId = updateDepartVO.getId(); - List<UmsDepartManage> departList = umsAdminDepartService.queryByDepartId(departId); - if (CollUtil.isNotEmpty(departList)) { - umsAdminDepartService.deletedByDepartId(departId); - } - userIds.forEach(e -> { - UmsDepartManage adminDepart = new UmsDepartManage(); - adminDepart.setDepartId(departId); - adminDepart.setUserId(e); - umsAdminDepartService.save(adminDepart); - }); - } - if (sccgDepartMapper.updateById(depart) != 1) { - throw new ApiException(ResultCode.RECORD_UPDATE_FAIL); + umsDepartService.updateById(depart); + if (updateDepartVO.getDepartManagerList().size() > 0) { + iDepartManagerService.deleteByDepartId(depart.getId()); + + updateDepartVO.getDepartManagerList() + .forEach(item -> { + item.setCreateTime(LocalDateTime.now()); + item.setDepartId(depart.getId()); + }); + iDepartManagerService.saveBatch(updateDepartVO.getDepartManagerList()); } } -- Gitblit v1.8.0