diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/mysql/employeebigbrother/EmployeeBigBrotherMapper.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/mysql/employeebigbrother/EmployeeBigBrotherMapper.java index 404d44f..c8aae29 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/mysql/employeebigbrother/EmployeeBigBrotherMapper.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/mysql/employeebigbrother/EmployeeBigBrotherMapper.java @@ -16,6 +16,7 @@ import org.apache.ibatis.annotations.Param; @Mapper public interface EmployeeBigBrotherMapper extends BaseMapperX { + IPage selectPage(@Param("page") IPage iPage,@Param("dto") EmployeeBigBrotherPageReqVO pageReqVO); IPage selectPagewithSelf(@Param("page") IPage iPage,@Param("dto") EmployeeBigBrotherPageReqVO pageReqVO); 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 b5c805d..bd4632f 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 @@ -101,7 +101,7 @@ public class EmployeeBigBrotherServiceImpl implements EmployeeBigBrotherService public PageResult getEmployeeBigBrotherPage(EmployeeBigBrotherPageReqVO pageReqVO) { pageReqVO.setTenantId(TenantContextHolder.getTenantId()); IPage iPage = new Page<>(pageReqVO.getPageNo(),pageReqVO.getPageSize()); - IPage bigBrotherDOIPage = employeeBigBrotherMapper.selectPagewithSelf(iPage, pageReqVO); + IPage bigBrotherDOIPage = employeeBigBrotherMapper.selectPage(iPage, pageReqVO); return new PageResult<>(bigBrotherDOIPage.getRecords(),bigBrotherDOIPage.getTotal()); } @@ -118,6 +118,7 @@ public class EmployeeBigBrotherServiceImpl implements EmployeeBigBrotherService bigBrotherDOS.add(bigBrotherDO); EmployeeBigBrotherDO employeeBigBrotherDO = BeanUtils.toBean(employeeBigBrotherSaveReqVO, EmployeeBigBrotherDO.class); employeeBigBrotherDO.setOperationStatus(0); + employeeBigBrotherDO.setId(null); employeeBigBrotherDOS.add(employeeBigBrotherDO); } employeeBigBrotherMapper.insertBatch(employeeBigBrotherDOS); 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 7a4cee1..71d52b0 100644 --- a/tkdata-model-server/src/main/resources/mapper/employeebigbrother/EmployeeBigBrotherMapper.xml +++ b/tkdata-model-server/src/main/resources/mapper/employeebigbrother/EmployeeBigBrotherMapper.xml @@ -119,4 +119,92 @@ + + \ No newline at end of file