From bdf8b36ac2ad291f89b250b142e9eb3783515b08 Mon Sep 17 00:00:00 2001 From: Ziin Date: Wed, 9 Jul 2025 14:22:25 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=9B=B4=E6=96=B0=E5=91=98=E5=B7=A5=E4=B8=BB?= =?UTF-8?q?=E6=92=AD=E5=92=8C=E5=A4=A7=E5=93=A5=E6=97=B6=E5=90=8C=E6=97=B6?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=91=98=E5=B7=A5=E5=90=8D=E4=B8=8B=E6=89=80?= =?UTF-8?q?=E6=9C=89=E5=90=8C=20ID=E6=95=B0=E6=8D=AE=202.=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=8E=92=E5=BA=8F=E8=A7=84=E5=88=99=EF=BC=8C=E9=98=B2?= =?UTF-8?q?=E6=AD=A2=E5=87=BA=E7=8E=B0=E6=97=B6=E9=97=B4=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../employeebigbrother/EmployeeBigBrotherDO.java | 2 ++ .../dataobject/employeehosts/EmployeeHostsDO.java | 2 ++ .../EmployeeBigBrotherServiceImpl.java | 10 +++++++++- .../employeehosts/EmployeeHostsServiceImpl.java | 12 +++++++++++- .../resources/mapper/bigbrother/BigBrotherMapper.xml | 3 +-- .../employeebigbrother/EmployeeBigBrotherMapper.xml | 4 ++-- .../mapper/employeehosts/EmployeeHostsMapper.xml | 4 ++-- .../resources/mapper/newhosts/NewHostsMapper.xml | 2 +- 8 files changed, 30 insertions(+), 9 deletions(-) diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/dataobject/employeebigbrother/EmployeeBigBrotherDO.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/dataobject/employeebigbrother/EmployeeBigBrotherDO.java index 9445bba..3ad2adf 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/dataobject/employeebigbrother/EmployeeBigBrotherDO.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/dataobject/employeebigbrother/EmployeeBigBrotherDO.java @@ -80,4 +80,6 @@ public class EmployeeBigBrotherDO extends BaseDO { */ private Integer operationStatus; + private Long tenantId; + } \ No newline at end of file diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/dataobject/employeehosts/EmployeeHostsDO.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/dataobject/employeehosts/EmployeeHostsDO.java index 4fda0e4..9641a6b 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/dataobject/employeehosts/EmployeeHostsDO.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/dataobject/employeehosts/EmployeeHostsDO.java @@ -80,4 +80,6 @@ public class EmployeeHostsDO extends BaseDO { private String remake; private String uid; + + private Long tenantId; } \ No newline at end of file diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeebigbrother/EmployeeBigBrotherServiceImpl.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeebigbrother/EmployeeBigBrotherServiceImpl.java index bd4632f..8521fbb 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeebigbrother/EmployeeBigBrotherServiceImpl.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeebigbrother/EmployeeBigBrotherServiceImpl.java @@ -8,8 +8,10 @@ import cn.iocoder.yudao.module.tkdata.controller.admin.employeebigbrother.vo.Emp import cn.iocoder.yudao.module.tkdata.controller.admin.employeebigbrother.vo.EmployeeBigBrotherSaveReqVO; import cn.iocoder.yudao.module.tkdata.dal.dataobject.bigbrother.BigBrotherDO; import cn.iocoder.yudao.module.tkdata.dal.dataobject.employeebigbrother.EmployeeBigBrotherDO; +import cn.iocoder.yudao.module.tkdata.dal.dataobject.employeehosts.EmployeeHostsDO; import cn.iocoder.yudao.module.tkdata.dal.mysql.bigbrother.BigBrotherMapper; import cn.iocoder.yudao.module.tkdata.dal.mysql.employeebigbrother.EmployeeBigBrotherMapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.generator.IFill; @@ -59,8 +61,14 @@ public class EmployeeBigBrotherServiceImpl implements EmployeeBigBrotherService // 校验存在 validateEmployeeBigBrotherExists(updateReqVO.getId()); // 更新 + Long tenantId = TenantContextHolder.getTenantId(); EmployeeBigBrotherDO updateObj = BeanUtils.toBean(updateReqVO, EmployeeBigBrotherDO.class); - employeeBigBrotherMapper.updateById(updateObj); + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.set(EmployeeBigBrotherDO::getOperationStatus, updateReqVO.getOperationStatus()); + updateWrapper.eq(EmployeeBigBrotherDO::getUserId, updateReqVO.getUserId()); + updateWrapper.eq(EmployeeBigBrotherDO::getDisplayId,updateObj.getDisplayId()); + updateWrapper.eq(EmployeeBigBrotherDO::getTenantId, tenantId); + employeeBigBrotherMapper.update(updateObj,updateWrapper); } @Override diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeehosts/EmployeeHostsServiceImpl.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeehosts/EmployeeHostsServiceImpl.java index ee72df3..34f10ae 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeehosts/EmployeeHostsServiceImpl.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeehosts/EmployeeHostsServiceImpl.java @@ -6,6 +6,8 @@ import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder; import cn.iocoder.yudao.module.tkdata.dal.dataobject.newhosts.NewHostsDO; import cn.iocoder.yudao.module.tkdata.dal.mysql.newhosts.NewHostsMapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.stereotype.Service; @@ -57,8 +59,16 @@ public class EmployeeHostsServiceImpl implements EmployeeHostsService { // 校验存在 validateEmployeeHostsExists(updateReqVO.getId()); // 更新 + Long tenantId = TenantContextHolder.getTenantId(); EmployeeHostsDO updateObj = BeanUtils.toBean(updateReqVO, EmployeeHostsDO.class); - employeeHostsMapper.updateById(updateObj); + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.set(EmployeeHostsDO::getOperationStatus, updateReqVO.getOperationStatus()); + updateWrapper.eq(EmployeeHostsDO::getUserId, updateReqVO.getUserId()); + updateWrapper.eq(EmployeeHostsDO::getHostsId,updateObj.getHostsId()); + updateWrapper.eq(EmployeeHostsDO::getTenantId, tenantId); + employeeHostsMapper.update(updateObj, updateWrapper); + +// employeeHostsMapper.updateById(updateObj); } @Override diff --git a/tkdata-model-server/src/main/resources/mapper/bigbrother/BigBrotherMapper.xml b/tkdata-model-server/src/main/resources/mapper/bigbrother/BigBrotherMapper.xml index f074d33..9234de5 100644 --- a/tkdata-model-server/src/main/resources/mapper/bigbrother/BigBrotherMapper.xml +++ b/tkdata-model-server/src/main/resources/mapper/bigbrother/BigBrotherMapper.xml @@ -96,7 +96,7 @@ - sbr.create_time desc,sbr.id + sbr.create_time desc,sbr.id desc @@ -117,6 +117,5 @@ - \ No newline at end of file diff --git a/tkdata-model-server/src/main/resources/mapper/employeebigbrother/EmployeeBigBrotherMapper.xml b/tkdata-model-server/src/main/resources/mapper/employeebigbrother/EmployeeBigBrotherMapper.xml index 4e72433..e7585b4 100644 --- a/tkdata-model-server/src/main/resources/mapper/employeebigbrother/EmployeeBigBrotherMapper.xml +++ b/tkdata-model-server/src/main/resources/mapper/employeebigbrother/EmployeeBigBrotherMapper.xml @@ -97,7 +97,7 @@ - sbr.create_time desc,sbr.id + sbr.create_time desc,sbr.id desc @@ -185,7 +185,7 @@ - sbr.create_time desc,sbr.id + sbr.create_time desc,sbr.id desc diff --git a/tkdata-model-server/src/main/resources/mapper/employeehosts/EmployeeHostsMapper.xml b/tkdata-model-server/src/main/resources/mapper/employeehosts/EmployeeHostsMapper.xml index 76019c2..931e71f 100644 --- a/tkdata-model-server/src/main/resources/mapper/employeehosts/EmployeeHostsMapper.xml +++ b/tkdata-model-server/src/main/resources/mapper/employeehosts/EmployeeHostsMapper.xml @@ -146,7 +146,7 @@ - ns.create_time desc,ns.id + ns.create_time desc,ns.id desc @@ -269,7 +269,7 @@ - ns.create_time desc,ns.id + ns.create_time desc,ns.id desc diff --git a/tkdata-model-server/src/main/resources/mapper/newhosts/NewHostsMapper.xml b/tkdata-model-server/src/main/resources/mapper/newhosts/NewHostsMapper.xml index a4f2712..2f2d24b 100644 --- a/tkdata-model-server/src/main/resources/mapper/newhosts/NewHostsMapper.xml +++ b/tkdata-model-server/src/main/resources/mapper/newhosts/NewHostsMapper.xml @@ -100,7 +100,7 @@ - ns.create_time desc,ns.id + ns.create_time desc,ns.id desc