Merge remote-tracking branch 'origin/master'

xiangpei

2024-04-28 387d3aca6fab1a07618bb8342ee522b3da2db9b1

 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)