From f4d2c29195f03ee5f08c92578bf877d76e969818 Mon Sep 17 00:00:00 2001 From: smallchill Date: Thu, 24 Mar 2022 01:58:05 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E5=8D=87=E7=BA=A7=E9=80=82=E9=85=8D=20?= =?UTF-8?q?mybatis-plus=203.5.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resource/service/impl/OssServiceImpl.java | 4 ++-- .../resource/service/impl/SmsServiceImpl.java | 4 ++-- .../system/service/impl/DeptServiceImpl.java | 4 ++-- .../system/service/impl/DictBizServiceImpl.java | 8 ++++---- .../system/service/impl/DictServiceImpl.java | 8 ++++---- .../system/service/impl/MenuServiceImpl.java | 8 ++++---- .../system/service/impl/RegionServiceImpl.java | 8 ++++---- .../system/service/impl/RoleServiceImpl.java | 12 ++++++------ .../system/user/service/impl/UserServiceImpl.java | 10 +++++----- 9 files changed, 33 insertions(+), 33 deletions(-) diff --git a/blade-ops/blade-resource/src/main/java/org/springblade/resource/service/impl/OssServiceImpl.java b/blade-ops/blade-resource/src/main/java/org/springblade/resource/service/impl/OssServiceImpl.java index 53ffdae2..e21b0ff1 100644 --- a/blade-ops/blade-resource/src/main/java/org/springblade/resource/service/impl/OssServiceImpl.java +++ b/blade-ops/blade-resource/src/main/java/org/springblade/resource/service/impl/OssServiceImpl.java @@ -47,8 +47,8 @@ public class OssServiceImpl extends BaseServiceImpl implements I public boolean submit(Oss oss) { LambdaQueryWrapper lqw = Wrappers.query().lambda() .eq(Oss::getOssCode, oss.getOssCode()).eq(Oss::getTenantId, AuthUtil.getTenantId()); - Integer cnt = baseMapper.selectCount(Func.isEmpty(oss.getId()) ? lqw : lqw.notIn(Oss::getId, oss.getId())); - if (cnt > 0) { + Long cnt = baseMapper.selectCount(Func.isEmpty(oss.getId()) ? lqw : lqw.notIn(Oss::getId, oss.getId())); + if (cnt > 0L) { throw new ServiceException("当前资源编号已存在!"); } return this.saveOrUpdate(oss); diff --git a/blade-ops/blade-resource/src/main/java/org/springblade/resource/service/impl/SmsServiceImpl.java b/blade-ops/blade-resource/src/main/java/org/springblade/resource/service/impl/SmsServiceImpl.java index bf2fcac7..10ea5ef0 100644 --- a/blade-ops/blade-resource/src/main/java/org/springblade/resource/service/impl/SmsServiceImpl.java +++ b/blade-ops/blade-resource/src/main/java/org/springblade/resource/service/impl/SmsServiceImpl.java @@ -47,8 +47,8 @@ public class SmsServiceImpl extends BaseServiceImpl implements I public boolean submit(Sms sms) { LambdaQueryWrapper lqw = Wrappers.query().lambda() .eq(Sms::getSmsCode, sms.getSmsCode()).eq(Sms::getTenantId, AuthUtil.getTenantId()); - Integer cnt = baseMapper.selectCount(Func.isEmpty(sms.getId()) ? lqw : lqw.notIn(Sms::getId, sms.getId())); - if (cnt > 0) { + Long cnt = baseMapper.selectCount(Func.isEmpty(sms.getId()) ? lqw : lqw.notIn(Sms::getId, sms.getId())); + if (cnt > 0L) { throw new ServiceException("当前资源编号已存在!"); } return this.saveOrUpdate(sms); diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java index c4f8138b..b344a1e7 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java @@ -126,8 +126,8 @@ public class DeptServiceImpl extends ServiceImpl implements ID @Override public boolean removeDept(String ids) { - Integer cnt = baseMapper.selectCount(Wrappers.query().lambda().in(Dept::getParentId, Func.toLongList(ids))); - if (cnt > 0) { + Long cnt = baseMapper.selectCount(Wrappers.query().lambda().in(Dept::getParentId, Func.toLongList(ids))); + if (cnt > 0L) { throw new ServiceException("请先删除子节点!"); } return removeByIds(Func.toLongList(ids)); diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DictBizServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DictBizServiceImpl.java index 3b346e8c..15f8f1e5 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DictBizServiceImpl.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DictBizServiceImpl.java @@ -74,8 +74,8 @@ public class DictBizServiceImpl extends ServiceImpl impl @Override public boolean submit(DictBiz dict) { LambdaQueryWrapper lqw = Wrappers.query().lambda().eq(DictBiz::getCode, dict.getCode()).eq(DictBiz::getDictKey, dict.getDictKey()); - Integer cnt = baseMapper.selectCount((Func.isEmpty(dict.getId())) ? lqw : lqw.notIn(DictBiz::getId, dict.getId())); - if (cnt > 0) { + Long cnt = baseMapper.selectCount((Func.isEmpty(dict.getId())) ? lqw : lqw.notIn(DictBiz::getId, dict.getId())); + if (cnt > 0L) { throw new ServiceException("当前字典键值已存在!"); } // 修改顶级字典后同步更新下属字典的编号 @@ -93,8 +93,8 @@ public class DictBizServiceImpl extends ServiceImpl impl @Override public boolean removeDict(String ids) { - Integer cnt = baseMapper.selectCount(Wrappers.query().lambda().in(DictBiz::getParentId, Func.toLongList(ids))); - if (cnt > 0) { + Long cnt = baseMapper.selectCount(Wrappers.query().lambda().in(DictBiz::getParentId, Func.toLongList(ids))); + if (cnt > 0L) { throw new ServiceException("请先删除子节点!"); } return removeByIds(Func.toLongList(ids)); diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DictServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DictServiceImpl.java index 1d6c005e..087520b0 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DictServiceImpl.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DictServiceImpl.java @@ -80,8 +80,8 @@ public class DictServiceImpl extends ServiceImpl implements ID @Override public boolean submit(Dict dict) { LambdaQueryWrapper lqw = Wrappers.query().lambda().eq(Dict::getCode, dict.getCode()).eq(Dict::getDictKey, dict.getDictKey()); - Integer cnt = baseMapper.selectCount((Func.isEmpty(dict.getId())) ? lqw : lqw.notIn(Dict::getId, dict.getId())); - if (cnt > 0) { + Long cnt = baseMapper.selectCount((Func.isEmpty(dict.getId())) ? lqw : lqw.notIn(Dict::getId, dict.getId())); + if (cnt > 0L) { throw new ServiceException("当前字典键值已存在!"); } // 修改顶级字典后同步更新下属字典的编号 @@ -99,8 +99,8 @@ public class DictServiceImpl extends ServiceImpl implements ID @Override public boolean removeDict(String ids) { - Integer cnt = baseMapper.selectCount(Wrappers.query().lambda().in(Dict::getParentId, Func.toLongList(ids))); - if (cnt > 0) { + Long cnt = baseMapper.selectCount(Wrappers.query().lambda().in(Dict::getParentId, Func.toLongList(ids))); + if (cnt > 0L) { throw new ServiceException("请先删除子节点!"); } return removeByIds(Func.toLongList(ids)); diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java index 62e5563c..762ac64a 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java @@ -223,8 +223,8 @@ public class MenuServiceImpl extends ServiceImpl implements IM @Override public boolean removeMenu(String ids) { - Integer cnt = baseMapper.selectCount(Wrappers.query().lambda().in(Menu::getParentId, Func.toLongList(ids))); - if (cnt > 0) { + Long cnt = baseMapper.selectCount(Wrappers.query().lambda().in(Menu::getParentId, Func.toLongList(ids))); + if (cnt > 0L) { throw new ServiceException("请先删除子节点!"); } return removeByIds(Func.toLongList(ids)); @@ -244,8 +244,8 @@ public class MenuServiceImpl extends ServiceImpl implements IM ) ); } - Integer cnt = baseMapper.selectCount(menuQueryWrapper); - if (cnt > 0) { + Long cnt = baseMapper.selectCount(menuQueryWrapper); + if (cnt > 0L) { throw new ServiceException("菜单名或编号已存在!"); } if (menu.getParentId() == null && menu.getId() == null) { diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RegionServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RegionServiceImpl.java index 48bc391e..6fc8f7d6 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RegionServiceImpl.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RegionServiceImpl.java @@ -47,8 +47,8 @@ public class RegionServiceImpl extends ServiceImpl impleme @Override public boolean submit(Region region) { - Integer cnt = baseMapper.selectCount(Wrappers.query().lambda().eq(Region::getCode, region.getCode())); - if (cnt > 0) { + Long cnt = baseMapper.selectCount(Wrappers.query().lambda().eq(Region::getCode, region.getCode())); + if (cnt > 0L) { return this.updateById(region); } // 设置祖区划编号 @@ -82,8 +82,8 @@ public class RegionServiceImpl extends ServiceImpl impleme @Override public boolean removeRegion(String id) { - Integer cnt = baseMapper.selectCount(Wrappers.query().lambda().eq(Region::getParentCode, id)); - if (cnt > 0) { + Long cnt = baseMapper.selectCount(Wrappers.query().lambda().eq(Region::getParentCode, id)); + if (cnt > 0L) { throw new ServiceException("请先删除子节点!"); } return removeById(id); diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RoleServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RoleServiceImpl.java index 11cea6f5..d6d525a1 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RoleServiceImpl.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RoleServiceImpl.java @@ -86,13 +86,13 @@ public class RoleServiceImpl extends ServiceImpl implements IR private boolean grantRoleMenu(List roleIds, List menuIds) { // 防止越权配置超管角色 - int administratorCount = baseMapper.selectCount(Wrappers.query().lambda().eq(Role::getRoleAlias, RoleConstant.ADMINISTRATOR).in(Role::getId, roleIds)); - if (!AuthUtil.isAdministrator() && administratorCount > 0) { + Long administratorCount = baseMapper.selectCount(Wrappers.query().lambda().eq(Role::getRoleAlias, RoleConstant.ADMINISTRATOR).in(Role::getId, roleIds)); + if (!AuthUtil.isAdministrator() && administratorCount > 0L) { throw new ServiceException("无权配置超管角色!"); } // 防止越权配置管理员角色 - int adminCount = baseMapper.selectCount(Wrappers.query().lambda().eq(Role::getRoleAlias, RoleConstant.ADMIN).in(Role::getId, roleIds)); - if (!AuthUtil.isAdmin() && adminCount > 0) { + Long adminCount = baseMapper.selectCount(Wrappers.query().lambda().eq(Role::getRoleAlias, RoleConstant.ADMIN).in(Role::getId, roleIds)); + if (!AuthUtil.isAdmin() && adminCount > 0L) { throw new ServiceException("无权配置管理员角色!"); } // 删除角色配置的菜单集合 @@ -220,8 +220,8 @@ public class RoleServiceImpl extends ServiceImpl implements IR @Override public boolean removeRole(String ids) { - Integer cnt = baseMapper.selectCount(Wrappers.query().lambda().in(Role::getParentId, Func.toLongList(ids))); - if (cnt > 0) { + Long cnt = baseMapper.selectCount(Wrappers.query().lambda().in(Role::getParentId, Func.toLongList(ids))); + if (cnt > 0L) { throw new ServiceException("请先删除子节点!"); } return removeByIds(Func.toLongList(ids)); diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java index fd60d8a0..9b0ada50 100644 --- a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java +++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java @@ -91,7 +91,7 @@ public class UserServiceImpl extends BaseServiceImpl implement String decrypt = DesUtil.decryptFormHex(licenseKey, TenantConstant.DES_KEY); accountNumber = JsonUtil.parse(decrypt, Tenant.class).getAccountNumber(); } - Integer tenantCount = baseMapper.selectCount(Wrappers.query().lambda().eq(User::getTenantId, tenantId)); + Long tenantCount = baseMapper.selectCount(Wrappers.query().lambda().eq(User::getTenantId, tenantId)); if (accountNumber != null && accountNumber > 0 && accountNumber <= tenantCount) { throw new ServiceException("当前租户已到最大账号额度!"); } @@ -99,8 +99,8 @@ public class UserServiceImpl extends BaseServiceImpl implement if (Func.isNotEmpty(user.getPassword())) { user.setPassword(DigestUtil.encrypt(user.getPassword())); } - Integer userCount = baseMapper.selectCount(Wrappers.query().lambda().eq(User::getTenantId, tenantId).eq(User::getAccount, user.getAccount())); - if (userCount > 0 && Func.isEmpty(user.getId())) { + Long userCount = baseMapper.selectCount(Wrappers.query().lambda().eq(User::getTenantId, tenantId).eq(User::getAccount, user.getAccount())); + if (userCount > 0L && Func.isEmpty(user.getId())) { throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount())); } return save(user) && submitUserDept(user); @@ -110,13 +110,13 @@ public class UserServiceImpl extends BaseServiceImpl implement @Transactional(rollbackFor = Exception.class) public boolean updateUser(User user) { String tenantId = user.getTenantId(); - Integer userCount = baseMapper.selectCount( + Long userCount = baseMapper.selectCount( Wrappers.query().lambda() .eq(User::getTenantId, tenantId) .eq(User::getAccount, user.getAccount()) .notIn(User::getId, user.getId()) ); - if (userCount > 0) { + if (userCount > 0L) { throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount())); } return updateUserInfo(user) && submitUserDept(user);