diff --git a/kernel-d-db/db-sdk-mp/src/main/java/cn/stylefeng/roses/kernel/db/mp/dboperator/DbOperatorImpl.java b/kernel-d-db/db-sdk-mp/src/main/java/cn/stylefeng/roses/kernel/db/mp/dboperator/DbOperatorImpl.java index 0140eb641..3f12de15c 100644 --- a/kernel-d-db/db-sdk-mp/src/main/java/cn/stylefeng/roses/kernel/db/mp/dboperator/DbOperatorImpl.java +++ b/kernel-d-db/db-sdk-mp/src/main/java/cn/stylefeng/roses/kernel/db/mp/dboperator/DbOperatorImpl.java @@ -24,6 +24,7 @@ */ package cn.stylefeng.roses.kernel.db.mp.dboperator; +import cn.hutool.core.convert.Convert; import cn.hutool.core.util.StrUtil; import cn.stylefeng.roses.kernel.db.api.DbOperatorApi; import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; @@ -44,7 +45,8 @@ public class DbOperatorImpl implements DbOperatorApi { @Override public int selectCount(String sql, Object... args) { - return SqlRunner.db().selectCount(sql, args); + long selectCount = SqlRunner.db().selectCount(sql, args); + return Convert.toInt(selectCount); } @Override diff --git a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/service/impl/SysFileInfoServiceImpl.java b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/service/impl/SysFileInfoServiceImpl.java index 4405c516c..3db277540 100644 --- a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/service/impl/SysFileInfoServiceImpl.java +++ b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/service/impl/SysFileInfoServiceImpl.java @@ -377,7 +377,7 @@ public class SysFileInfoServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(SysFileInfo::getFileObjectName, sysFileInfoRequest.getFileObjectName()); wrapper.eq(SysFileInfo::getSecretFlag, YesOrNotEnum.Y.getCode()); - int count = this.count(wrapper); + long count = this.count(wrapper); if (count > 0) { if (!LoginContext.me().hasLogin()) { throw new FileException(FileExceptionEnum.FILE_PERMISSION_DENIED); diff --git a/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/service/impl/CustomerServiceImpl.java b/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/service/impl/CustomerServiceImpl.java index bb42497bc..f2048452d 100644 --- a/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/service/impl/CustomerServiceImpl.java +++ b/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/service/impl/CustomerServiceImpl.java @@ -553,14 +553,14 @@ public class CustomerServiceImpl extends ServiceImpl i LambdaQueryWrapper accountWrapper = new LambdaQueryWrapper<>(); accountWrapper.eq(Customer::getAccount, customerRequest.getAccount()); - int count = this.count(accountWrapper); + long count = this.count(accountWrapper); if (count > 0) { throw new CustomerException(CustomerExceptionEnum.ACCOUNT_REPEAT); } LambdaQueryWrapper emailWrapper = new LambdaQueryWrapper<>(); emailWrapper.eq(Customer::getEmail, customerRequest.getEmail()); - int emailCount = this.count(emailWrapper); + long emailCount = this.count(emailWrapper); if (emailCount > 0) { throw new CustomerException(CustomerExceptionEnum.EMAIL_REPEAT); } diff --git a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/impl/DictServiceImpl.java b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/impl/DictServiceImpl.java index 9e94aa3dc..1992f850d 100644 --- a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/impl/DictServiceImpl.java +++ b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/impl/DictServiceImpl.java @@ -281,7 +281,7 @@ public class DictServiceImpl extends ServiceImpl implements sysDictLambdaQueryWrapper.ne(SysDict::getDictId, dictRequest.getDictId()); } sysDictLambdaQueryWrapper.ne(SysDict::getDelFlag, YesOrNotEnum.Y.getCode()); - int count = this.count(sysDictLambdaQueryWrapper); + long count = this.count(sysDictLambdaQueryWrapper); if (count > 0) { throw new DictException(DictExceptionEnum.DICT_CODE_REPEAT, dictRequest.getDictTypeCode(), dictRequest.getDictCode()); } @@ -294,7 +294,7 @@ public class DictServiceImpl extends ServiceImpl implements dictNameWrapper.ne(SysDict::getDictId, dictRequest.getDictId()); } dictNameWrapper.ne(SysDict::getDelFlag, YesOrNotEnum.Y.getCode()); - int dictNameCount = this.count(dictNameWrapper); + long dictNameCount = this.count(dictNameWrapper); if (dictNameCount > 0) { throw new DictException(DictExceptionEnum.DICT_NAME_REPEAT, dictRequest.getDictTypeCode(), dictRequest.getDictCode()); } diff --git a/kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/service/impl/SysMessageServiceImpl.java b/kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/service/impl/SysMessageServiceImpl.java index 2d4f16780..0ec02820f 100644 --- a/kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/service/impl/SysMessageServiceImpl.java +++ b/kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/service/impl/SysMessageServiceImpl.java @@ -25,6 +25,7 @@ package cn.stylefeng.roses.kernel.message.db.service.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; import cn.stylefeng.roses.kernel.db.api.factory.PageFactory; import cn.stylefeng.roses.kernel.db.api.factory.PageResultFactory; @@ -96,7 +97,8 @@ public class SysMessageServiceImpl extends ServiceImpl wrapper = createWrapper(messageRequest, false); - return this.count(wrapper); + long count = this.count(wrapper); + return Convert.toInt(count); } /** diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/impl/HomePageServiceImpl.java b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/impl/HomePageServiceImpl.java index 46ebbfb73..4633b37fc 100644 --- a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/impl/HomePageServiceImpl.java +++ b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/impl/HomePageServiceImpl.java @@ -1,5 +1,6 @@ package cn.stylefeng.roses.kernel.system.modular.home.service.impl; +import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.stylefeng.roses.kernel.auth.api.context.LoginContext; @@ -121,7 +122,8 @@ public class HomePageServiceImpl implements HomePageService, HomePageServiceApi HomeCompanyInfo homeCompanyInfo = new HomeCompanyInfo(); // 获取组织机构总数量 - homeCompanyInfo.setOrganizationNum(hrOrganizationService.count()); + long count = hrOrganizationService.count(); + homeCompanyInfo.setOrganizationNum(Convert.toInt(count)); // 获取企业人员总数量 SysUserRequest sysUserRequest = new SysUserRequest(); @@ -147,8 +149,8 @@ public class HomePageServiceImpl implements HomePageService, HomePageServiceApi // 设置当前所属机构和所有子机构的人数 List orgIds = organizations.stream().map(HrOrganization::getOrgId).collect(Collectors.toList()); - int currentOrgPersonNum = sysUserOrgService.count(Wrappers.lambdaQuery(SysUserOrg.class).in(SysUserOrg::getOrgId, orgIds)); - homeCompanyInfo.setCurrentCompanyPersonNum(currentOrgPersonNum); + Long currentOrgPersonNum = sysUserOrgService.count(Wrappers.lambdaQuery(SysUserOrg.class).in(SysUserOrg::getOrgId, orgIds)); + homeCompanyInfo.setCurrentCompanyPersonNum(Convert.toInt(currentOrgPersonNum)); return homeCompanyInfo; } diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrPositionServiceImpl.java b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrPositionServiceImpl.java index 5a2bd3fa6..65f66b642 100644 --- a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrPositionServiceImpl.java +++ b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrPositionServiceImpl.java @@ -26,6 +26,7 @@ package cn.stylefeng.roses.kernel.system.modular.organization.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; +import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.stylefeng.roses.kernel.db.api.factory.PageFactory; @@ -131,7 +132,7 @@ public class HrPositionServiceImpl extends ServiceImpl allResource = this.list(sysResourceLambdaQueryWrapper); @@ -380,7 +378,8 @@ public class SysResourceServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(SysTheme::getTemplateId, sysThemeTemplate.getTemplateId()); - int sysThemeNum = sysThemeService.count(queryWrapper); + long sysThemeNum = sysThemeService.count(queryWrapper); if (sysThemeNum > 0) { throw new SystemModularException(SysThemeTemplateExceptionEnum.TEMPLATE_IS_USED); }