From 387d3aca6fab1a07618bb8342ee522b3da2db9b1 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期日, 28 四月 2024 10:09:26 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java | 26 ++++++++++++++++++-------- 1 files changed, 18 insertions(+), 8 deletions(-) diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java index 35e1fab..a0fb489 100644 --- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java +++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java @@ -27,6 +27,7 @@ import com.ycl.utils.SecurityUtils; import org.springframework.stereotype.Service; import org.springframework.beans.BeanUtils; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.Assert; import java.util.Objects; @@ -56,6 +57,7 @@ * @return */ @Override + @Transactional(rollbackFor = Exception.class) public Result add(YwUnitForm form) { YwUnit entity = YwUnitForm.getEntityByForm(form, null); if(baseMapper.insert(entity) > 0) { @@ -86,6 +88,7 @@ * @return */ @Override + @Transactional(rollbackFor = Exception.class) public Result update(YwUnitForm form) { YwUnit entity = baseMapper.selectById(form.getId()); @@ -111,15 +114,16 @@ * @return */ @Override + @Transactional(rollbackFor = Exception.class) public Result remove(List<String> ids) { - ids.forEach(id -> { - // 鍒犻櫎杩愮淮浜哄憳璐﹀彿 - SysUser sysUser = sysUserMapper.selectUserByUserName(baseMapper.selectById(id).getUnitAdminAccount()); - if (Objects.nonNull(sysUser)) { - sysUserRoleMapper.deleteUserRoleByUserId(sysUser.getUserId()); - sysUserMapper.deleteUserById(sysUser.getUserId()); - } - }); + List<Long> userIds = sysUserMapper.selectUserIdByNames( + baseMapper.selectList( + new LambdaQueryWrapper<YwUnit>().in(YwUnit::getId, ids)) + .stream().map(YwUnit::getUnitAdminAccount).toList()); + if (!userIds.isEmpty()) { + sysUserMapper.deleteUserByIds(userIds.toArray(new Long[0])); + sysUserRoleMapper.deleteUserRoleByUserIds(userIds); + } if(baseMapper.deleteBatchIds(ids) > 0) { return Result.ok("鍒犻櫎鎴愬姛"); } @@ -207,6 +211,12 @@ } @Override + public Result workList() { + List<YwUnitVO> entities = baseMapper.workList(); + return Result.ok().data(entities); + } + + @Override public List<YwUnitVO> export(YwUnitQuery query) { // 鍒嗛〉鏉′欢鏌ヨ浣� IPage<YwUnit> page = new LambdaQueryChainWrapper<>(baseMapper) -- Gitblit v1.8.0