From 197285c9bf225c850c0df72b036f43a96d6bd1ed Mon Sep 17 00:00:00 2001 From: wangql <937675070@qq.com> Date: Thu, 9 May 2024 16:29:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E5=B7=A5=E4=BD=9C=E6=B5=81=E6=A8=A1=E5=9D=97pom?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=BE=9D=E8=B5=96=E9=97=B4=E8=B7=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-modules/ruoyi-workflow/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ruoyi-modules/ruoyi-workflow/pom.xml b/ruoyi-modules/ruoyi-workflow/pom.xml index 021709868..7cfcd98e0 100644 --- a/ruoyi-modules/ruoyi-workflow/pom.xml +++ b/ruoyi-modules/ruoyi-workflow/pom.xml @@ -85,26 +85,32 @@ org.dromara ruoyi-common-mybatis + org.dromara ruoyi-common-web + org.dromara ruoyi-common-log + org.dromara ruoyi-common-idempotent + org.dromara ruoyi-common-excel + org.dromara ruoyi-common-translation + org.dromara ruoyi-common-tenant From d68fbd079dbf3473006148a8d85a98465848e6cb Mon Sep 17 00:00:00 2001 From: wangql <937675070@qq.com> Date: Thu, 9 May 2024 16:49:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E9=98=B2?= =?UTF-8?q?=E6=AD=A2selectOne=E6=9F=A5=E8=AF=A2=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/system/service/impl/SysConfigServiceImpl.java | 7 ++++--- .../system/service/impl/SysDictDataServiceImpl.java | 4 ++-- .../system/service/impl/SysOssConfigServiceImpl.java | 2 +- .../dromara/system/service/impl/SysUserServiceImpl.java | 8 ++++---- .../workflow/service/impl/ActHiProcinstServiceImpl.java | 2 +- .../workflow/service/impl/WfCategoryServiceImpl.java | 2 +- .../workflow/service/impl/WfTaskBackNodeServiceImpl.java | 4 ++-- 7 files changed, 15 insertions(+), 14 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java index 7738d8067..7f1668f71 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java @@ -71,7 +71,7 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService { @Override public String selectConfigByKey(String configKey) { SysConfig retConfig = baseMapper.selectOne(new LambdaQueryWrapper() - .eq(SysConfig::getConfigKey, configKey)); + .eq(SysConfig::getConfigKey, configKey), false); if (ObjectUtil.isNotNull(retConfig)) { return retConfig.getConfigValue(); } @@ -80,6 +80,7 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService { /** * 获取注册开关 + * * @param tenantId 租户id * @return true开启，false关闭 */ @@ -87,7 +88,7 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService { public boolean selectRegisterEnabled(String tenantId) { SysConfig retConfig = TenantHelper.dynamic(tenantId, () -> { return baseMapper.selectOne(new LambdaQueryWrapper() - .eq(SysConfig::getConfigKey, "sys.account.registerUser")); + .eq(SysConfig::getConfigKey, "sys.account.registerUser"), false); }); if (ObjectUtil.isNull(retConfig)) { return false; @@ -197,7 +198,7 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService { @Override public boolean checkConfigKeyUnique(SysConfigBo config) { long configId = ObjectUtil.isNull(config.getConfigId()) ? -1L : config.getConfigId(); - SysConfig info = baseMapper.selectOne(new LambdaQueryWrapper().eq(SysConfig::getConfigKey, config.getConfigKey())); + SysConfig info = baseMapper.selectOne(new LambdaQueryWrapper().eq(SysConfig::getConfigKey, config.getConfigKey()), false); if (ObjectUtil.isNotNull(info) && info.getConfigId() != configId) { return false; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java index 1ab0fafd1..6b00a8323 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java @@ -73,7 +73,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService { return baseMapper.selectOne(new LambdaQueryWrapper() .select(SysDictData::getDictLabel) .eq(SysDictData::getDictType, dictType) - .eq(SysDictData::getDictValue, dictValue)) + .eq(SysDictData::getDictValue, dictValue), false) .getDictLabel(); } @@ -146,7 +146,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService { public boolean checkDictDataUnique(SysDictDataBo dict) { Long dictCode = ObjectUtil.isNull(dict.getDictCode()) ? -1L : dict.getDictCode(); SysDictData entity = baseMapper.selectOne(new LambdaQueryWrapper() - .eq(SysDictData::getDictType, dict.getDictType()).eq(SysDictData::getDictValue, dict.getDictValue())); + .eq(SysDictData::getDictType, dict.getDictType()).eq(SysDictData::getDictValue, dict.getDictValue()), false); if (ObjectUtil.isNotNull(entity) && !dictCode.equals(entity.getDictCode())) { return false; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssConfigServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssConfigServiceImpl.java index 2ecd59276..17095edf0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssConfigServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssConfigServiceImpl.java @@ -150,7 +150,7 @@ public class SysOssConfigServiceImpl implements ISysOssConfigService { long ossConfigId = ObjectUtil.isNull(sysOssConfig.getOssConfigId()) ? -1L : sysOssConfig.getOssConfigId(); SysOssConfig info = baseMapper.selectOne(new LambdaQueryWrapper() .select(SysOssConfig::getOssConfigId, SysOssConfig::getConfigKey) - .eq(SysOssConfig::getConfigKey, sysOssConfig.getConfigKey())); + .eq(SysOssConfig::getConfigKey, sysOssConfig.getConfigKey()), false); if (ObjectUtil.isNotNull(info) && info.getOssConfigId() != ossConfigId) { return false; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java index 93f1cc7fd..3238767fb 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java @@ -569,7 +569,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { @Override public String selectUserNameById(Long userId) { SysUser sysUser = baseMapper.selectOne(new LambdaQueryWrapper() - .select(SysUser::getUserName).eq(SysUser::getUserId, userId)); + .select(SysUser::getUserName).eq(SysUser::getUserId, userId), false); return ObjectUtil.isNull(sysUser) ? null : sysUser.getUserName(); } @@ -583,7 +583,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { @Cacheable(cacheNames = CacheNames.SYS_NICKNAME, key = "#userId") public String selectNicknameById(Long userId) { SysUser sysUser = baseMapper.selectOne(new LambdaQueryWrapper() - .select(SysUser::getNickName).eq(SysUser::getUserId, userId)); + .select(SysUser::getNickName).eq(SysUser::getUserId, userId),false); return ObjectUtil.isNull(sysUser) ? null : sysUser.getNickName(); } @@ -614,7 +614,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { @Override public String selectPhonenumberById(Long userId) { SysUser sysUser = baseMapper.selectOne(new LambdaQueryWrapper() - .select(SysUser::getPhonenumber).eq(SysUser::getUserId, userId)); + .select(SysUser::getPhonenumber).eq(SysUser::getUserId, userId),false); return ObjectUtil.isNull(sysUser) ? null : sysUser.getPhonenumber(); } @@ -627,7 +627,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { @Override public String selectEmailById(Long userId) { SysUser sysUser = baseMapper.selectOne(new LambdaQueryWrapper() - .select(SysUser::getEmail).eq(SysUser::getUserId, userId)); + .select(SysUser::getEmail).eq(SysUser::getUserId, userId),false); return ObjectUtil.isNull(sysUser) ? null : sysUser.getEmail(); } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActHiProcinstServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActHiProcinstServiceImpl.java index 06d607b4f..76552b639 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActHiProcinstServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActHiProcinstServiceImpl.java @@ -45,7 +45,7 @@ public class ActHiProcinstServiceImpl implements IActHiProcinstService { public ActHiProcinst selectByBusinessKey(String businessKey) { return baseMapper.selectOne(new LambdaQueryWrapper() .eq(ActHiProcinst::getBusinessKey, businessKey) - .eq(TenantHelper.isEnable(), ActHiProcinst::getTenantId, TenantHelper.getTenantId())); + .eq(TenantHelper.isEnable(), ActHiProcinst::getTenantId, TenantHelper.getTenantId()), false); } } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfCategoryServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfCategoryServiceImpl.java index c5cb28887..a1883b8d0 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfCategoryServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfCategoryServiceImpl.java @@ -124,6 +124,6 @@ public class WfCategoryServiceImpl implements IWfCategoryService { */ @Override public WfCategory queryByCategoryCode(String categoryCode) { - return baseMapper.selectOne(new LambdaQueryWrapper().eq(WfCategory::getCategoryCode, categoryCode)); + return baseMapper.selectOne(new LambdaQueryWrapper().eq(WfCategory::getCategoryCode, categoryCode), false); } } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfTaskBackNodeServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfTaskBackNodeServiceImpl.java index 0992f6f08..bc00a203f 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfTaskBackNodeServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfTaskBackNodeServiceImpl.java @@ -81,7 +81,7 @@ public class WfTaskBackNodeServiceImpl implements IWfTaskBackNodeService { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(WfTaskBackNode::getInstanceId, processInstanceId); queryWrapper.eq(WfTaskBackNode::getNodeId, nodeId); - return wfTaskBackNodeMapper.selectOne(queryWrapper); + return wfTaskBackNodeMapper.selectOne(queryWrapper, false); } @Override @@ -91,7 +91,7 @@ public class WfTaskBackNodeServiceImpl implements IWfTaskBackNodeService { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(WfTaskBackNode::getInstanceId, processInstanceId); queryWrapper.eq(WfTaskBackNode::getNodeId, targetActivityId); - WfTaskBackNode actTaskNode = wfTaskBackNodeMapper.selectOne(queryWrapper); + WfTaskBackNode actTaskNode = wfTaskBackNodeMapper.selectOne(queryWrapper, false); if (ObjectUtil.isNotNull(actTaskNode)) { Integer orderNo = actTaskNode.getOrderNo(); List taskNodeList = getListByInstanceId(processInstanceId);